Fix test_remote_initiator_after_non_remote

[ianton-ru]

Changelog category (leave one):

• CI Fix or Improvement (changelog entry is not required)

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

Fix test_storage_iceberg_with_spark/test_remote_initiator.py::test_remote_initiator_after_non_remote

Documentation entry for user-facing changes

node1 chooses random node from cluster cluster_simple as remote initiator.
But node1 is a member of cluster_simple, and with chance 1/3 it chooses itself.
In this case later optimization 'if remote request is to current node, do not make remote request' makes request as non-remote again, and query creates less subqueries than expected.

CI/CD Options

Exclude tests:

• Fast test
• Integration Tests
• Stateless tests
• Stateful tests
• Performance tests
• All with ASAN
• All with TSAN
• All with MSAN
• All with UBSAN
• All with Coverage
• All with Aarch64
• All Regression
• Disable CI Cache

Regression jobs to run:

• Fast suites (mostly <1h)
• Aggregate Functions (2h)
• Alter (1.5h)
• Benchmark (30m)
• ClickHouse Keeper (1h)
• Iceberg (2h)
• LDAP (1h)
• Parquet (1.5h)
• RBAC (1.5h)
• SSL Server (1h)
• S3 (2h)
• S3 Export (2h)
• Swarms (30m)
• Tiered Storage (2h)

[github-actions]

Workflow [PR], commit [b2ffe81]

[CarlosFelipeOR]

QA Verification — PR #1856 (Fix test_remote_initiator_after_non_remote)

Verdict

✅ Approve from QA.

Test-only fix, contained and self-consistent. The target test now passes on every relevant integration lane, and no other suite can be affected by the change.

Scope of changes

Verified via diff:

• tests/integration/test_storage_iceberg_with_spark/configs/config.d/cluster.xml — adds a new cluster cluster_23 (node2 + node3). Does not modify the existing cluster_simple, so any other test using cluster_simple is unaffected.
• tests/integration/test_storage_iceberg_with_spark/test_remote_initiator.py — switches the fan-out cluster from cluster_simple to cluster_23 in 2 places, and updates the expected sub-query counts from 4 → 3 and 5 → 4 accordingly.

No production code touched, no shared fixtures modified.

Validation

test_storage_iceberg_with_spark/test_remote_initiator.py::test_remote_initiator_after_non_remote passed in all integration lanes where it ran:

• Integration tests (amd_binary, 5/5)
• Integration tests (amd_asan, db disk, old analyzer, 4/6)
• Integration tests (arm_binary, distributed plan, 2/4)

No CI-level triage required: the PR cannot affect anything outside this single test.