Refactor addDefaultRackBookiesIfMinNumRacksIsEnforced to Remove Redundant Logic #4652
Conversation
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
liangyepianzhou
changed the title
…dant Logic and Improve Robustness
### Motivation
The current implementation of `addDefaultRackBookiesIfMinNumRacksIsEnforced` has the following issues:
- **Redundant logic**: The initialization and merging process for collecting Bookie nodes on the default rack involves unnecessary data copying and checks.
- **Potential robustness issue**: There is no null check for the address returned by `BookieNode.getAddr()`, which may result in `null` values being included in the exclusion set.
- **Incorrect logging**: The log claims to print only the defaultRack Bookies that are being excluded, while it actually prints all the nodes, including those already in `excludeBookies`.
```java
LOG.info("enforceMinNumRacksPerWriteQuorum is enabled, so Excluding bookies of defaultRack: {}", bookiesInDefaultRack);
```
---
### Modification
- When creating `bookiesInDefaultRack`, do not copy elements from `excludeBookies`.
- Add a null check for the address returned by `BookieNode.getAddr()`.
- Remove unnecessary null checks for `bookiesInDefaultRack`.
liangyepianzhou
force-pushed
the
addDefaultRackBookiesIfMinNumRacksIsEnforced
branch
from
4c7eee7 to
a5b6830
Compare
StevenLuMT
reviewed
Aug 15, 2025
...-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
Outdated
Show resolved
Hide resolved
liangyepianzhou
changed the title
eolivelli
previously requested changes
Sep 22, 2025
Contributor
eolivelli
left a comment
eolivelli
left a comment
There was a problem hiding this comment.
which test cases are covering this change ?
Contributor
Author
It seems that there was previously no test coverage for this method, so I have added some test cases for |
added 2 commits
September 24, 2025 19:42
lhotari
reviewed
Oct 14, 2025
...-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
Outdated
Show resolved
Hide resolved
lhotari
reviewed
Oct 14, 2025
...-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
Show resolved
Hide resolved
lhotari
approved these changes
Oct 15, 2025
Member
lhotari
left a comment
lhotari
left a comment
There was a problem hiding this comment.
LGTM, good work @liangyepianzhou
lhotari
reviewed
Oct 15, 2025
...ver/src/test/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImplTest.java
Outdated
Show resolved
Hide resolved
eolivelli
dismissed
their stale review
Canceling my review.
Thanks for following up with my requests
I don't have time to complete my review this week
Member
|
@eolivelli Help review this PR |
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the addDefaultRackBookiesIfMinNumRacksIsEnforced method to eliminate redundant logic and improve code clarity. The method is responsible for adding bookies from the default rack to an exclusion set when minimum rack enforcement is enabled.
Key changes:
- Streamlined control flow by early-returning when
enforceMinNumRacksPerWriteQuorumis false - Removed unnecessary initialization of
bookiesInDefaultRackwithexcludeBookiescontent - Eliminated redundant null checks for
bookiesInDefaultRack
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| RackawareEnsemblePlacementPolicyImpl.java | Refactored the method to remove redundant data copying, simplified control flow with early returns, and removed unnecessary null checks |
| RackawareEnsemblePlacementPolicyImplTest.java | Added comprehensive test coverage for the refactored method with three test scenarios: bookies in default rack, mixed node types, and empty default rack |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
...-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
Outdated
Show resolved
Hide resolved
...-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
Show resolved
Hide resolved
…ackawareEnsemblePlacementPolicyImpl.java Co-authored-by: Copilot <[email protected]>
Contributor
Author
|
reopen due to #4665 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Motivation
The current implementation of
addDefaultRackBookiesIfMinNumRacksIsEnforcedhas the following issues:excludeBookies.Modification
bookiesInDefaultRack, do not copy elements fromexcludeBookies.bookiesInDefaultRack.