do not sleep after last retry before raising exception (influxdata#790)

krzysbaranski · web-flow · commit e7ef0454524b · 2020-04-11T18:45:32.000-05:00
* do not sleep after last retry before raising exception

* documentation: clarification of retry parameter

retry=0 - retry forever
retry=1 - try once, on error don't do any retry
retry=2 - 2 tries, one original and one retry on error
retry=3 - 3 tries, one original and maximum two retries on errors

* retries - move raise before sleep

* retries - documentation

* fix line length
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -59,8 +59,12 @@ class InfluxDBClient(object):
     :param timeout: number of seconds Requests will wait for your client to
         establish a connection, defaults to None
     :type timeout: int
-    :param retries: number of retries your client will try before aborting,
-        defaults to 3. 0 indicates try until success
+    :param retries: number of attempts your client will make before aborting,
+        defaults to 3
+        0 - try until success
+        1 - attempt only once (without retry)
+        2 - maximum two attempts (including one retry)
+        3 - maximum three attempts (default option)
     :type retries: int
     :param use_udp: use UDP to connect to InfluxDB, defaults to False
     :type use_udp: bool
@@ -339,10 +343,10 @@ def request(self, url, method='GET', params=None, data=None, stream=False,
                 _try += 1
                 if self._retries != 0:
                     retry = _try < self._retries
-                if method == "POST":
-                    time.sleep((2 ** _try) * random.random() / 100.0)
                 if not retry:
                     raise
+                if method == "POST":
+                    time.sleep((2 ** _try) * random.random() / 100.0)
 
         type_header = response.headers and response.headers.get("Content-Type")
         if type_header == "application/x-msgpack" and response.content:
