Updates.

Author: antip00

s3/regression.py

@@ -198,6 +198,10 @@
         "implemented on antalya build with clickhouse version 24.12",
         check_clickhouse_version("<24.12"),
     ),
+    "minio/table function performance/wildcard": (
+        Skip,
+        "needs investigation",
+    ),
     ":/hive partitioning": (
         Skip,
         "implemented on antalya build with clickhouse version 24.12",

s3/tests/common.py

@@ -1746,20 +1746,22 @@ def assert_row_count(self, node, table_name: str, rows: int = 1000000):
 def check_consistency(self, nodes, table_name, sync_timeout=10):
     """SYNC the given nodes and check that they agree about the given table"""
 
-    with When("I make sure all nodes are synced"):
-        for node in nodes:
-            sync_replica(
-                node=node, table_name=table_name, timeout=sync_timeout, no_checks=True
-            )
+    for attempt in retries(timeout=100, delay=10):
+        with attempt:
+            with When("I make sure all nodes are synced"):
+                for node in nodes:
+                    sync_replica(
+                        node=node, table_name=table_name, timeout=sync_timeout, no_checks=True
+                    )
 
-    with When("I query all nodes for their row counts"):
-        row_counts = {}
-        for node in nodes:
-            row_counts[node.name] = get_row_count(node=node, table_name=table_name)
+            with When("I query all nodes for their row counts"):
+                row_counts = {}
+                for node in nodes:
+                    row_counts[node.name] = get_row_count(node=node, table_name=table_name)
 
-    with Then("All replicas should have the same state"):
-        for n1, n2 in combinations(nodes, 2):
-            assert row_counts[n1.name] == row_counts[n2.name], error()
+            with Then("All replicas should have the same state"):
+                for n1, n2 in combinations(nodes, 2):
+                    assert row_counts[n1.name] == row_counts[n2.name], error()
 
 
 @TestStep(Given)

s3/tests/table_function_performance.py

@@ -37,12 +37,14 @@ def s3_create_many_files(self):
 
     @TestStep(When)
     def insert_files(self, folder_id, iteration):
-        node.query(
-            f"""INSERT INTO TABLE FUNCTION 
-            s3('{self.context.many_files_uri}id={folder_id}/file_{{_partition_id}}.csv','{access_key_id}','{secret_access_key}','CSV','d UInt64') 
-            PARTITION BY (d % {num_files_per_folder}) SELECT * FROM {table_name} 
-            -- {iteration}/{num_folders}"""
-        )
+        for attempt in retries(timeout=100, delay=10):
+            with attempt:
+                node.query(
+                    f"""INSERT INTO TABLE FUNCTION 
+                    s3('{self.context.many_files_uri}id={folder_id}/file_{{_partition_id}}.csv','{access_key_id}','{secret_access_key}','CSV','d UInt64') 
+                    PARTITION BY (d % {num_files_per_folder}) SELECT * FROM {table_name} 
+                    -- {iteration}/{num_folders}"""
+                )
 
     with Given("I have a table with data"):
         simple_table(node=node, name=table_name, policy="default")