fix: properly mark batch for retrying even without retrying strategy

Author: vlastahajek

CHANGELOG.md

@@ -2,6 +2,7 @@
 ## 3.5.1 [in progress]
 ### Fixes
 - [#114](https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino/pull/114) - Renamed `getRemaingRetryTime()`->`getRemainingRetryTime()`
+- [#115](https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino/pull/115) - Restored writing capability after a connection failure
 
 ## 3.5.0 [2020-10-30]
 ### Features

src/InfluxDbClient.cpp

@@ -468,8 +468,8 @@ bool InfluxDBClient::flushBufferInternal(bool flashOnlyFull) {
                 _lastFlushed = millis()/1000;
                 dropCurrentBatch();
             } else if(retry) {
+                _writeBuffer[_batchPointer]->retryCount++;
                 if(statusCode > 0) { //apply retry strategy only in case of HTTP errors
-                    _writeBuffer[_batchPointer]->retryCount++;
                     if(_writeBuffer[_batchPointer]->retryCount > _writeOptions._maxRetryAttempts) {
                         INFLUXDB_CLIENT_DEBUG("[D] Reached max retry count, dropping batch\n");
                         dropCurrentBatch();

test/Test.cpp

@@ -94,6 +94,7 @@ void Test::run() {
     testFailedWrites();
     testTimestamp();
     testRetryOnFailedConnection();
+    testRetryOnFailedConnectionWithFlush();
     testBufferOverwriteBatchsize1();
     testBufferOverwriteBatchsize5();
     testServerTempDownBatchsize5();
@@ -503,6 +504,81 @@ void Test::testRetryOnFailedConnection() {
     deleteAll(Test::apiUrl);
 }
 
+void Test::testRetryOnFailedConnectionWithFlush() {
+    TEST_INIT("testRetryOnFailedConnectionWithFlush");
+
+    InfluxDBClient clientOk(Test::apiUrl, Test::orgName, Test::bucketName, Test::token);
+    clientOk.setWriteOptions(WriteOptions().batchSize(2).bufferSize(2).retryInterval(4));
+    waitServer(Test::managementUrl, true);
+    TEST_ASSERT(clientOk.validateConnection());
+    Point *p = createPoint("test1");
+    TEST_ASSERT(clientOk.writePoint(*p));
+    delete p;
+    TEST_ASSERT(clientOk.flushBuffer());
+    TEST_ASSERT(clientOk.isBufferEmpty());
+
+    clientOk.setHTTPOptions(HTTPOptions().httpReadTimeout(500));
+
+    Serial.println("Stop server!");
+    waitServer(Test::managementUrl, false);
+    // test dropping batch on max retry count
+    TEST_ASSERT(!clientOk.validateConnection());
+    p = createPoint("test1");
+    TEST_ASSERT(clientOk.writePoint(*p));
+    delete p;
+
+    Serial.print(millis()/1000.0f,3);
+    Serial.println(" Write 1");
+
+    TEST_ASSERT(!clientOk.flushBuffer());
+    TEST_ASSERT(!clientOk.isBufferEmpty());
+    Serial.println(clientOk.getLastErrorMessage());
+    
+    Serial.print(millis()/1000.0f,3);
+    Serial.println(" Write 2");
+
+    TEST_ASSERT(!clientOk.flushBuffer());
+    TEST_ASSERT(!clientOk.isBufferEmpty());
+    Serial.println(clientOk.getLastErrorMessage());
+
+    Serial.print(millis()/1000.0f,3);
+    Serial.println(" Write 3");
+
+    TEST_ASSERT(!clientOk.flushBuffer());
+    TEST_ASSERT(!clientOk.isBufferEmpty());
+    Serial.println(clientOk.getLastErrorMessage());
+    
+   
+    Serial.println("Start server!");
+    waitServer(Test::managementUrl, true);
+    clientOk.setHTTPOptions(HTTPOptions().httpReadTimeout(5000));
+    TEST_ASSERT(clientOk.validateConnection());
+
+    Serial.print(millis()/1000.0f,3);
+    Serial.println(" Write 4");
+    p = createPoint("test1");
+    TEST_ASSERT(clientOk.writePoint(*p));
+    delete p;
+    TEST_ASSERT(clientOk.flushBuffer());
+    TEST_ASSERT(clientOk.isBufferEmpty());
+
+    Serial.print(millis()/1000.0f,3);
+    Serial.println(" Write 5");
+    p = createPoint("test1");
+    TEST_ASSERT(clientOk.writePoint(*p));
+    delete p;
+    TEST_ASSERT(clientOk.flushBuffer());
+    TEST_ASSERT(clientOk.isBufferEmpty());
+
+    String query = "select";
+    FluxQueryResult q = clientOk.query(query);
+    TEST_ASSERT(countLines(q) == 3);
+
+
+    TEST_END();
+    deleteAll(Test::apiUrl);
+}
+
 void Test::testBufferOverwriteBatchsize1() {
     TEST_INIT("testBufferOverwriteBatchsize1");
     InfluxDBClient client(INFLUXDB_CLIENT_TESTING_BAD_URL, Test::orgName, Test::bucketName, Test::token);

test/Test.h

@@ -68,6 +68,7 @@ class Test {
     static void testTimestamp();
     static void testHTTPReadTimeout();
     static void testRetryOnFailedConnection();
+    static void testRetryOnFailedConnectionWithFlush();
     static void testBufferOverwriteBatchsize1();
     static void testBufferOverwriteBatchsize5();
     static void testServerTempDownBatchsize5();