tests: disable keeper sessions check for test_keeper_disks

azat · azat · commit 965732998df5 · 2025-01-05T17:41:33.000+01:00
CI: https://s3.amazonaws.com/clickhouse-test-reports/74076/21f310c99887e2d3189555aa584ba0c655087435/integration_tests__asan__old_analyzer__[6_6].html Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
diff --git a/tests/integration/helpers/keeper_utils.py b/tests/integration/helpers/keeper_utils.py
@@ -282,7 +282,9 @@ def send_4lw_cmd(cluster, node, cmd="ruok", port=9181):
 NOT_SERVING_REQUESTS_ERROR_MSG = "This instance is not currently serving requests"
 
 
-def wait_until_connected(cluster, node, port=9181, timeout=30.0):
+def wait_until_connected(
+    cluster, node, port=9181, timeout=30.0, wait_complete_readiness=True
+):
     start = time.time()
 
     logging.debug(
@@ -299,31 +301,34 @@ def wait_until_connected(cluster, node, port=9181, timeout=30.0):
                 f"{timeout}s timeout while waiting for {node.name} to start serving requests"
             )
 
-    host = cluster.get_instance_ip(node.name)
-    logging.debug(
-        "Waiting until keeper can create sessions on %s:%d (timeout=%f)",
-        host,
-        port,
-        timeout,
-    )
-    while True:
-        zk_cli = None
-        try:
-            time_passed = min(time.time() - start, 5.0)
-            if time_passed >= timeout:
-                raise Exception(
-                    f"{timeout}s timeout while waiting for {node.name} to start serving requests"
+    if wait_complete_readiness:
+        host = cluster.get_instance_ip(node.name)
+        logging.debug(
+            "Waiting until keeper can create sessions on %s:%d (timeout=%f)",
+            host,
+            port,
+            timeout,
+        )
+        while True:
+            zk_cli = None
+            try:
+                time_passed = min(time.time() - start, 5.0)
+                if time_passed >= timeout:
+                    raise Exception(
+                        f"{timeout}s timeout while waiting for {node.name} to start serving requests"
+                    )
+                zk_cli = KazooClient(
+                    hosts=f"{host}:9181", timeout=timeout - time_passed
                 )
-            zk_cli = KazooClient(hosts=f"{host}:9181", timeout=timeout - time_passed)
-            zk_cli.start()
-            zk_cli.get("/keeper/api_version")
-            break
-        except (ConnectionLoss, OperationTimeoutError, KazooTimeoutError):
-            pass
-        finally:
-            if zk_cli:
-                zk_cli.stop()
-                zk_cli.close()
+                zk_cli.start()
+                zk_cli.get("/keeper/api_version")
+                break
+            except (ConnectionLoss, OperationTimeoutError, KazooTimeoutError):
+                pass
+            finally:
+                if zk_cli:
+                    zk_cli.stop()
+                    zk_cli.close()
 
 
 def wait_until_quorum_lost(cluster, node, port=9181):
diff --git a/tests/integration/test_keeper_disks/test.py b/tests/integration/test_keeper_disks/test.py
@@ -91,7 +91,11 @@ def setup_storage(cluster, node, storage_config, cleanup_disks):
         storage_config,
     )
     node.start_clickhouse()
-    keeper_utils.wait_until_connected(cluster, node)
+    # complete readiness checks that the sessions can be established,
+    # but it creates sesssion for this, which will create one more record in log,
+    # but this test is very strict on number of entries in the log,
+    # so let's avoid this extra check and rely on retry policy
+    keeper_utils.wait_until_connected(cluster, node, wait_complete_readiness=False)
 
 
 def setup_local_storage(cluster, node):
