From b73d420baab3fd5a7678fb67b3cb0c159437aa68 Mon Sep 17 00:00:00 2001
From: Anton Ivashkin <ianton@live.com>
Date: Mon, 1 Jun 2026 12:18:14 +0200
Subject: [PATCH] Fix test_remote_initiator_after_non_remote

---
 .../configs/config.d/cluster.xml                     | 12 ++++++++++++
 .../test_remote_initiator.py                         |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/tests/integration/test_storage_iceberg_with_spark/configs/config.d/cluster.xml b/tests/integration/test_storage_iceberg_with_spark/configs/config.d/cluster.xml
index 54c08b27abe8..5835f155a998 100644
--- a/tests/integration/test_storage_iceberg_with_spark/configs/config.d/cluster.xml
+++ b/tests/integration/test_storage_iceberg_with_spark/configs/config.d/cluster.xml
@@ -16,5 +16,17 @@
                 </replica>
             </shard>
         </cluster_simple>
+        <cluster_23>
+            <shard>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node3</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster_23>
     </remote_servers>
 </clickhouse>
diff --git a/tests/integration/test_storage_iceberg_with_spark/test_remote_initiator.py b/tests/integration/test_storage_iceberg_with_spark/test_remote_initiator.py
index ba0a61f9a998..194d5613c21f 100644
--- a/tests/integration/test_storage_iceberg_with_spark/test_remote_initiator.py
+++ b/tests/integration/test_storage_iceberg_with_spark/test_remote_initiator.py
@@ -54,7 +54,7 @@ def flush_logs():
             FROM {TABLE_NAME}
             WHERE number=1
         SETTINGS
-            object_storage_cluster='cluster_simple'
+            object_storage_cluster='cluster_23'
         """,
         query_id = query_id)
     assert res == "1\t1\n"
@@ -64,7 +64,7 @@ def flush_logs():
             FROM clusterAllReplicas('cluster_simple', system.query_log)
             WHERE type='QueryFinish' AND initial_query_id='{query_id}'
         """)
-    assert queries == "4\n"
+    assert queries == "3\n"
 
     query_id = uuid.uuid4().hex
     res = instance.query(f"""
@@ -73,7 +73,7 @@ def flush_logs():
             WHERE number=1
         SETTINGS
             object_storage_remote_initiator=1,
-            object_storage_cluster='cluster_simple'
+            object_storage_cluster='cluster_23'
         """,
         query_id = query_id)
     assert res == "1\t1\n"
@@ -83,7 +83,7 @@ def flush_logs():
             FROM clusterAllReplicas('cluster_simple', system.query_log)
             WHERE type='QueryFinish' AND initial_query_id='{query_id}'
         """)
-    assert queries == "6\n"
+    assert queries == "5\n"
 
     query_id = uuid.uuid4().hex
     res = instance.query(f"""