summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej Skrocki <maciej.skrocki@intel.com>2017-09-19 14:00:53 -0700
committerRoss Brattain <ross.b.brattain@intel.com>2017-09-25 08:30:20 -0700
commitbc0dd2e225f85c4a16629197c8e7a480a1134706 (patch)
treee7e43208ab0c8f33903edb118f439c159c97bf7a
parent717999408252e973d3e288fb6aefd1b02e1c3f44 (diff)
Introduced timeout to post method of HttpClient
We seen cases where grafana container bring-up code would fail, because of too quick access to the http api. Added 10sec timeout for the first query of the API. Change-Id: Ifc95a626d0ab5552a1f26fb167fc3f65791392d7 Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
-rw-r--r--api/resources/v1/env.py2
-rw-r--r--yardstick/common/httpClient.py24
2 files changed, 15 insertions, 11 deletions
diff --git a/api/resources/v1/env.py b/api/resources/v1/env.py
index 47ea91643..04cc659c7 100644
--- a/api/resources/v1/env.py
+++ b/api/resources/v1/env.py
@@ -123,7 +123,7 @@ class V1Env(ApiResource):
"isDefault": True,
}
try:
- HttpClient().post(url, data)
+ HttpClient().post(url, data, timeout=10)
except Exception:
LOG.exception('Create datasources failed')
raise
diff --git a/yardstick/common/httpClient.py b/yardstick/common/httpClient.py
index 11c2d752d..54f7be670 100644
--- a/yardstick/common/httpClient.py
+++ b/yardstick/common/httpClient.py
@@ -9,6 +9,7 @@
from __future__ import absolute_import
import logging
+import time
from oslo_serialization import jsonutils
import requests
@@ -18,18 +19,21 @@ logger = logging.getLogger(__name__)
class HttpClient(object):
- def post(self, url, data):
+ def post(self, url, data, timeout=0):
data = jsonutils.dump_as_bytes(data)
headers = {'Content-Type': 'application/json'}
- try:
- response = requests.post(url, data=data, headers=headers)
- result = response.json()
- logger.debug('The result is: %s', result)
-
- return result
- except Exception as e:
- logger.debug('Failed: %s', e)
- raise
+ t_end = time.time() + timeout
+ while True:
+ try:
+ response = requests.post(url, data=data, headers=headers)
+ result = response.json()
+ logger.debug('The result is: %s', result)
+ return result
+ except Exception:
+ if time.time() > t_end:
+ logger.exception('')
+ raise
+ time.sleep(1)
def get(self, url):
response = requests.get(url)