{{ message }}
Antalya 26.5: 26.1 Antalya port - improvements for cluster requests#1953
Open
zvonand wants to merge 3 commits into
Open
Antalya 26.5: 26.1 Antalya port - improvements for cluster requests#1953zvonand wants to merge 3 commits into
zvonand wants to merge 3 commits into
Conversation
…next commit) --- Original cherry-pick message follows: Merge pull request #1414 from Altinity/frontport/antalya-26.1/rendezvous_hashing 26.1 Antalya port - improvements for cluster requests # Conflicts: # src/Common/ProfileEvents.cpp # src/Core/Settings.cpp # src/Disks/DiskObjectStorage/ObjectStorages/IObjectStorage.h # src/Parsers/ASTSystemQuery.cpp # src/QueryPipeline/RemoteQueryExecutor.cpp # src/QueryPipeline/RemoteQueryExecutor.h # src/Storages/ObjectStorage/DataLakes/IDataLakeMetadata.h # src/Storages/ObjectStorage/DataLakes/Iceberg/ManifestFile.h # src/Storages/ObjectStorage/StorageObjectStorageSource.cpp # src/Storages/StorageFileCluster.cpp # src/Storages/StorageURLCluster.cpp # tests/integration/test_s3_cluster/test.py # tests/integration/test_storage_s3/test.py # tests/queries/0_stateless/03413_experimental_settings_cannot_be_enabled_by_default.sql
ProfileEvents.cpp: added ObjectStorageCluster* events before the antalya-26.5 AI/JoinBuildPostProcessing events. Settings.cpp: added allow_retries_in_cluster_requests as obsolete alongside antalya-26.5 additions. IObjectStorage.h: added setFileMetaInfo/getFileMetaInfo/getCommand/getFileNameWithoutExtension methods from source PR. ASTSystemQuery.cpp: kept both STOP/START_SWARM_MODE (source PR) and FREE_MEMORY/RESET_DDL_WORKER (antalya-26.5) cases. RemoteQueryExecutor.cpp/h: added new skipUnavailableShards() const method (source PR) alongside needToSkipUnavailableShard() made const. IDataLakeMetadata.h: kept both antalya-26.5 includes (DiskType.h, WriteBuffer.h) and source PR SchemaProcessor.h. ManifestFile.h: dropped the old ColumnInfo struct inside #if USE_AVRO (source PR moved it to DB::Iceberg namespace outside the guard, already applied). StorageObjectStorageSource.cpp: merged ProfileEvents/Setting extern declarations, adapted the do-while loop structure (source PR) to preserve antalya-26.5 query condition cache logic; query_condition_cache skips use not_a_path=true to force re-loop in do-while. Adapted: do-while loop in StorageObjectStorageSource::createReader — loop was while(true) on antalya-26.5 but do-while in source PR; merged by keeping do-while structure and adapting query_condition_cache continue statements to use not_a_path=true to force re-entry. StorageFileCluster.cpp / StorageURLCluster.cpp: took source PR's TaskIterator class hierarchy (FileTaskIterator / UrlTaskIterator) over antalya-26.5's lambda-based approach. test_s3_cluster/test.py: added test_graceful_shutdown, test_remote_hedged, test_remote_no_hedged from source PR. test_storage_s3/test.py: kept both sync_insert.xml (antalya-26.5) and lock_object_storage_task_distribution_ms.xml (source PR). 03413 SQL test: merged NOT IN exception lists from both sides.
Antalya 26.3: Fix rescheduleTasksFromReplica
zvonand
added
releasy
This was referenced Jun 29, 2026
ianton-ru
requested changes
Jun 29, 2026
| return context->getSettingsRef()[Setting::skip_unavailable_shards]; | ||
| } | ||
|
|
||
| bool RemoteQueryExecutor::needToSkipUnavailableShard() const |
There was a problem hiding this comment.
This method is not const after ClickHouse#99369
There was a problem hiding this comment.
Cycle was changed in upstream from do ... while on while in ClickHouse#102115, I think need to keep it and rewrite PR to follow that change.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Frontports for Antalya 26.1
CI/CD Options
Exclude tests:
Regression jobs to run:
Combined port of 2 PR(s) (group
pr-1747). Cherry-picked from #1414, #1747.