Merge pull request #2214 from ClickHouse/adjust-reliability-of-select

Adding multiple loops for count verification

Author: Paultagoras

performance/src/test/com/clickhouse/benchmark/clients/BenchmarkBase.java

@@ -190,13 +190,16 @@ public static void insertData(String tableName, InputStream dataStream, ClickHou
     }
 
 
-    public static void verifyCount(String tableName, long expectedCount) {
+    public static boolean verifyCount(String tableName, long expectedCount) {
         syncQuery(tableName);
         List<GenericRecord> records = runQuery(BenchmarkRunner.getSelectCountQuery(tableName));
         BigInteger count = records.get(0).getBigInteger(1);
         if (count.longValue() != expectedCount) {
-            throw new IllegalStateException(String.format("Expected %d rows but got %d", expectedCount, count));
+            LOGGER.error("Expected {} but got {}", expectedCount, count);
+            return false;
         }
+        LOGGER.info("Count verified: {}", count);
+        return true;
     }
 
     protected static ClickHouseClient getClientV1() {

performance/src/test/com/clickhouse/benchmark/clients/InsertClient.java

@@ -30,9 +30,24 @@ public class InsertClient extends BenchmarkBase {
 
     @TearDown(Level.Invocation)
     public void verifyRowsInsertedAndCleanup(DataState dataState) {
-        verifyCount(dataState.tableNameEmpty, dataState.dataSet.getSize());
+        boolean success;
+        int count = 0;
+        do {
+            success = verifyCount(dataState.tableNameEmpty, dataState.dataSet.getSize());
+            if (!success) {
+                LOGGER.warn("Retrying to verify rows inserted");
+                try {
+                    Thread.sleep(2500);
+                } catch (InterruptedException e) {
+                    LOGGER.error("Error: ", e);
+                }
+            }
+        } while (!success && count++ < 10);
+        if (!success) {
+            LOGGER.error("Failed to verify rows inserted");
+            throw new RuntimeException("Failed to verify rows inserted");
+        }
         truncateTable(dataState.tableNameEmpty);
-        syncQuery(dataState.tableNameEmpty);
     }
 
     @Benchmark