Merge pull request ClickHouse#80274 from ClickHouse/syncs

Fix more flakiness in test_refreshable_mv

Author: alexey-milovidov

tests/integration/test_refreshable_mv/test.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, QueryRuntimeException
 from helpers.network import PartitionManager
 from helpers.test_tools import assert_eq_with_retry, assert_logs_contain
 
@@ -354,8 +354,13 @@ def test_pause(started_cluster, cleanup):
     assert node2.query("select * from re.a") == "1\n"
     node2.query("system stop replicated view re.a")
     node1.restart_clickhouse() # just to guarantee that it notices the new znode
+    try:
+        node2.query("system wait view re.a")
+    except QueryRuntimeException as ex:
+        # If the node1.restart_clickhouse() interrupted a refresh, the error message (with substring
+        # "cancelled") is written to keeper, then thrown by "system wait view". That's normal.
+        assert "cancelled" in str(ex)
     node2.query(
-        "system wait view re.a;"
         "truncate table re.src;"
         "insert into re.src values (2);")
     time.sleep(3)
@@ -415,6 +420,8 @@ def do_test_backup(to_table):
 
     assert node1.query(tables_exist_query) == "2\n"
     assert node2.query(tables_exist_query) == "2\n"
+    node1.query(f'SYSTEM SYNC REPLICA re.{target}')
+    node2.query(f'SYSTEM SYNC REPLICA re.{target}')
     assert node1.query(f'SELECT * FROM re.{target}') == '1\n'
     assert node2.query(f'SELECT * FROM re.{target}') == '1\n'