feat: exponential factor to 5, the maximal delay is 180_000 milliseconds, default retry interval is 5000

Author: bednar

CHANGELOG.md

@@ -3,7 +3,7 @@
 ### Features
 1. [#136](https://github.com/influxdata/influxdb-client-python/pull/136): Allows users to skip of verifying SSL certificate
 1. [#143](https://github.com/influxdata/influxdb-client-python/pull/143): Skip of verifying SSL certificate could be configured via config file or environment properties
-1. [#140](https://github.com/influxdata/influxdb-client-python/pull/140): Added exponential backoff strategy for batching writes, Allowed to configure default retry strategy   
+1. [#140](https://github.com/influxdata/influxdb-client-python/pull/140): Added exponential backoff strategy for batching writes, Allowed to configure default retry strategy. Default value for `retry_interval` is 5_000 milliseconds.   
 
 ## 1.9.0 [2020-07-17]
 

README.rst

@@ -250,13 +250,13 @@ The batching is configurable by ``write_options``\ :
      - ``0``
    * - **retry_interval**
      - the number of milliseconds to retry unsuccessful write. The retry interval is used when the InfluxDB server does not specify "Retry-After" header.
-     - ``1000``
+     - ``5000``
    * - **max_retries**
      - the number of max retries when write fails
      - ``3``
    * - **max_retry_delay**
      - the maximum delay between each retry attempt in milliseconds
-     - ``15_000``
+     - ``180_000``
 
 
 .. code-block:: python

influxdb_client/client/write/retry.py

@@ -14,9 +14,7 @@ class WritesRetry(Retry):
     :param int max_retry_delay: maximum delay when retrying write
     """
 
-    WRITES_RETRY_AFTER_STATUS_CODES = frozenset([429, 503])
-
-    def __init__(self, jitter_interval=0, max_retry_delay=15, **kw):
+    def __init__(self, jitter_interval=0, max_retry_delay=180, **kw):
         """Initialize defaults."""
         super().__init__(**kw)
         self.jitter_interval = jitter_interval
@@ -35,7 +33,7 @@ def is_retry(self, method, status_code, has_retry_after=False):
         if not self._is_method_retryable(method):
             return False
 
-        return self.total and (status_code in self.WRITES_RETRY_AFTER_STATUS_CODES)
+        return self.total and (status_code >= 429)
 
     def get_backoff_time(self):
         """Variant of exponential backoff with initial and max delay and a random jitter delay."""
@@ -50,7 +48,7 @@ def get_backoff_time(self):
         if consecutive_errors_len < 0:
             return 0
 
-        backoff_value = self.backoff_factor * (2 ** consecutive_errors_len) + self._jitter_delay()
+        backoff_value = self.backoff_factor * (5 ** consecutive_errors_len) + self._jitter_delay()
         return min(self.max_retry_delay, backoff_value)
 
     def get_retry_after(self, response):

influxdb_client/client/write_api.py

@@ -37,9 +37,9 @@ class WriteOptions(object):
     def __init__(self, write_type: WriteType = WriteType.batching,
                  batch_size=1_000, flush_interval=1_000,
                  jitter_interval=0,
-                 retry_interval=1_000,
+                 retry_interval=5_000,
                  max_retries=3,
-                 max_retry_delay=15_000,
+                 max_retry_delay=180_000,
                  write_scheduler=ThreadPoolScheduler(max_workers=1)) -> None:
         """
         Create write api configuration.

tests/test_WriteApiBatching.py

@@ -178,10 +178,17 @@ def test_jitter_interval(self):
                          httpretty.httpretty.latest_requests[1].parsed_body)
 
     def test_retry_interval(self):
+
+        self._write_client.__del__()
+
+        # Set retry interval to 1_500
+        self.write_options = WriteOptions(batch_size=2, flush_interval=5_000, retry_interval=1_500)
+        self._write_client = WriteApi(influxdb_client=self.influxdb_client, write_options=self.write_options)
+
         httpretty.register_uri(httpretty.POST, uri="http://localhost/api/v2/write", status=204)
         httpretty.register_uri(httpretty.POST, uri="http://localhost/api/v2/write", status=503)
         httpretty.register_uri(httpretty.POST, uri="http://localhost/api/v2/write", status=429,
-                               adding_headers={'Retry-After': '5'})
+                               adding_headers={'Retry-After': '3'})
         httpretty.register_uri(httpretty.POST, uri="http://localhost/api/v2/write", status=503)
 
         self._write_client.write("my-bucket", "my-org",
@@ -191,14 +198,14 @@ def test_retry_interval(self):
         time.sleep(1)
         self.assertEqual(1, len(httpretty.httpretty.latest_requests), msg="first request immediately")
 
-        time.sleep(3)
+        time.sleep(1.5)
         self.assertEqual(2, len(httpretty.httpretty.latest_requests), msg="second request after delay_interval")
 
-        time.sleep(5)
+        time.sleep(3)
         self.assertEqual(3, len(httpretty.httpretty.latest_requests), msg="third request after Retry-After")
 
-        time.sleep(12)
-        self.assertEqual(4, len(httpretty.httpretty.latest_requests), msg="fourth after exponential delay = 3 * 2 * 3")
+        time.sleep(37.5)
+        self.assertEqual(4, len(httpretty.httpretty.latest_requests), msg="fourth after exponential delay = 1.5 * 5**2")
 
         self.assertEqual("h2o_feet,location=coyote_creek level\\ water_level=1.0 1\n"
                          "h2o_feet,location=coyote_creek level\\ water_level=2.0 2",

tests/test_WriteOptions.py

@@ -8,9 +8,9 @@ def test_default(self):
         retry = WriteOptions().to_retry_strategy()
 
         self.assertEqual(retry.total, 3)
-        self.assertEqual(retry.backoff_factor, 1)
+        self.assertEqual(retry.backoff_factor, 5)
         self.assertEqual(retry.jitter_interval, 0)
-        self.assertEqual(retry.max_retry_delay, 15)
+        self.assertEqual(retry.max_retry_delay, 180)
         self.assertEqual(retry.method_whitelist, ["POST"])
 
     def test_custom(self):

tests/test_WritesRetry.py

@@ -21,7 +21,7 @@ def test_copy_jitter(self):
         self.assertEqual(retry.total, 8)
 
     def test_backoff(self):
-        retry = WritesRetry(total=5, backoff_factor=1, max_retry_delay=100)
+        retry = WritesRetry(total=5, backoff_factor=1, max_retry_delay=550)
         self.assertEqual(retry.total, 5)
         self.assertEqual(retry.is_exhausted(), False)
         self.assertEqual(retry.get_backoff_time(), 0)
@@ -34,22 +34,22 @@ def test_backoff(self):
         retry = retry.increment()
         self.assertEqual(retry.total, 3)
         self.assertEqual(retry.is_exhausted(), False)
-        self.assertEqual(retry.get_backoff_time(), 2)
+        self.assertEqual(retry.get_backoff_time(), 5)
 
         retry = retry.increment()
         self.assertEqual(retry.total, 2)
         self.assertEqual(retry.is_exhausted(), False)
-        self.assertEqual(retry.get_backoff_time(), 4)
+        self.assertEqual(retry.get_backoff_time(), 25)
 
         retry = retry.increment()
         self.assertEqual(retry.total, 1)
         self.assertEqual(retry.is_exhausted(), False)
-        self.assertEqual(retry.get_backoff_time(), 8)
+        self.assertEqual(retry.get_backoff_time(), 125)
 
         retry = retry.increment()
         self.assertEqual(retry.total, 0)
         self.assertEqual(retry.is_exhausted(), False)
-        self.assertEqual(retry.get_backoff_time(), 16)
+        self.assertEqual(retry.get_backoff_time(), 550)
 
         with self.assertRaises(MaxRetryError) as cm:
             retry.increment()
@@ -98,6 +98,16 @@ def test_is_retry(self):
 
         self.assertTrue(retry.is_retry("POST", 429, True))
 
+    def test_is_retry_428(self):
+        retry = WritesRetry(method_whitelist=["POST"])
+
+        self.assertFalse(retry.is_retry("POST", 428, True))
+
+    def test_is_retry_430(self):
+        retry = WritesRetry(method_whitelist=["POST"])
+
+        self.assertTrue(retry.is_retry("POST", 430, True))
+
     def test_is_retry_retry_after_header_is_not_required(self):
         retry = WritesRetry(method_whitelist=["POST"])