Antalya 26.4: Fix file identifier in rescheduleTasksFromReplica#1881
Open
zvonand wants to merge 2 commits into
Open
Antalya 26.4: Fix file identifier in rescheduleTasksFromReplica#1881zvonand wants to merge 2 commits into
zvonand wants to merge 2 commits into
Conversation
…next commit) --- Original cherry-pick message follows: Merge pull request #1748 from Altinity/feature/antalya-26.3/pr-1493 Antalya 26.3: Fix file identifier in rescheduleTasksFromReplica # Conflicts: # src/Storages/ObjectStorage/StorageObjectStorageStableTaskDistributor.cpp # src/Storages/ObjectStorage/StorageObjectStorageStableTaskDistributor.h
Ported `getFileIdentifier` helper and its usage in `getPreQueuedFile`, `getMatchingFileFromIterator`, and `getAnyUnprocessedFile`. Applied mutex locking around `getReplicaForFile` in `getMatchingFileFromIterator` as introduced by the source PR. `saveLastNodeActivity`, `rescheduleTasksFromReplica`, and the locking of `replica_to_files_to_be_processed` from the source PR were not ported: `antalya-26.4` does not have `replica_to_files_to_be_processed`, `last_node_activity`, or `rescheduleTasksFromReplica` — those require a separate prerequisite port of the tracking infrastructure from `antalya-26.3`. The `iceberg_read_optimization_enabled` block in the conflict for `getMatchingFileFromIterator` was pre-existing `antalya-26.3` code not present in source PR #1748's diff; it was not added.
zvonand
added
releasy
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
1 participant
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):
Solved #1486
File identifier for distributed tasks was changed between 25.8 and 26.1
In frontport #1414 it was missed and rescheduleTasksFromReplica continued to use old variant.
Fix unsyncronized access to
replica_to_files_to_be_processedclass member (#1493 by @ianton-ru) (#1748 by @zvonand).CI/CD Options
Exclude tests:
Regression jobs to run:
Cherry-picked from #1748.
Documentation entry for user-facing changes
...