Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HDFS-17453. IncrementalBlockReport can have race condition with Edit Log Tailer #6708

Merged
merged 12 commits into from
Apr 10, 2024
Merged

HDFS-17453. IncrementalBlockReport can have race condition with Edit Log Tailer #6708

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e9c7350
Fix race condition between IBR and Edit tailing on Standby
Apr 4, 2024
acdabfb
Add Unit Test and fix removal condition
Apr 4, 2024
bc2aead
Add comment
Apr 4, 2024
79d91cb
Add Unit Test
Apr 5, 2024
d637a41
Fix unit tests
Apr 6, 2024
4ec0e6c
Add better null handling
Apr 6, 2024
9ff9a64
Fix unit test
Apr 7, 2024
3ba3098
Fix checkstyle
Apr 7, 2024
91a7973
Fix TestDNFencing tests
Apr 8, 2024
181bccb
Remove unnecessary line
Apr 8, 2024
599d98d
Fix unit test
Apr 8, 2024
7e36db7
Fix unit tests
Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix unit tests
  • Loading branch information
Danny Becker committed Apr 9, 2024
commit 7e36db7affc66da101cfda141c9f35afc82aa606
5 changes: 3 additions & 2 deletions .../src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingDataNodeMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,10 @@ void removeAllMessagesForDatanode(DatanodeDescriptor dn) {

void enqueueReportedBlock(DatanodeStorageInfo storageInfo, Block block,
ReplicaState reportedState) {
if (storageInfo == null || block == null || reportedState == null) {
if (storageInfo == null || block == null) {
return;
}
block = new Block(block);
long genStamp = block.getGenerationStamp();
Queue<ReportedBlockInfo> queue = null;
if (BlockIdManager.isStripedBlockID(block.getBlockId())) {
Expand All @@ -117,7 +118,7 @@ void enqueueReportedBlock(DatanodeStorageInfo storageInfo, Block block,
rbi.block.getGenerationStamp() <= genStamp)) {
count -= (size - queue.size());
}
queue.add(new ReportedBlockInfo(storageInfo, new Block(block), reportedState));
queue.add(new ReportedBlockInfo(storageInfo, block, reportedState));
count++;
}

Expand Down
Loading