ADH-7550: Backport protobuf 2.5.0 removal to Ozone 2.1.0#12
Merged
Conversation
… not empty" despite all children deleted until double buffer is flushed (apache#9739)
… tableKey mapping is stale (apache#9810)
…dOnlyNodeHandler on NetworkTopology DeadNodeHandler and HealthyReadOnlyNodeHandler run on separate SingleThreadExecutors, which can lead to a race condition where a resurrected datanode is removed from the NetworkTopology after being re-added. This leaves the node reachable but invisible to the placement policy. Fix: DeadNodeHandler now checks the current node state before removing it from the topology, skipping removal if the node is no longer DEAD. HealthyReadOnlyNodeHandler uses unconditional add (idempotent) instead of a contains-then-add check, closing the TOCTOU gap. Made-with: Cursor (cherry picked from commit 6fb6387)
(cherry picked from commit b4f1876)
(cherry picked from commit e4d4ad2)
(cherry picked from commit 2b0f233)
(cherry picked from commit 78cd896)
(cherry picked from commit acf7fa5)
Signed-off-by: peterxcli <peterxcli@gmail.com> (cherry picked from commit 6d805da)
Asmoday
approved these changes
May 26, 2026
…ows to improve security and build configurations
…exclusions in integration test POM
…ating unique volume names
… for PMD in CI workflows
…ion to improve test stability
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
7 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.
The change updates Ozone/Hadoop dependency alignment so the runtime no longer pulls
protobuf-java-2.5.0, while keepinghadoop-maven-pluginson3.4.2. The Hadoop stack is aligned with the ADH build version3.4.3.1-4.3.0-1.What Changed
protobuf-java-2.5.0.