Skip to content

HDFS-16783. Remove the redundant lock in deepCopyReplica and getFinalizedBlocks #4942

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

Merged
Hexiaoqiao merged 2 commits into from
Oct 10, 2022
Merged

HDFS-16783. Remove the redundant lock in deepCopyReplica and getFinalizedBlocks #4942

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e012308
HDFS-16783. Remove the redundant lock in deepCopyReplica
Sep 28, 2022
e895ab5
HDFS-16783. Remove the redundant lock in getFinalizedBlocks
Sep 28, 2022
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
39 changes: 17 additions & 22 deletions ...fs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,16 +210,14 @@ public Block getStoredBlock(String bpid, long blkid)
@Override
public Set<? extends Replica> deepCopyReplica(String bpid)
throws IOException {
try (AutoCloseDataSetLock l = lockManager.readLock(LockLevel.BLOCK_POOl, bpid)) {
Set<ReplicaInfo> replicas = new HashSet<>();
volumeMap.replicas(bpid, (iterator) -> {
while (iterator.hasNext()) {
ReplicaInfo b = iterator.next();
replicas.add(b);
}
});
return replicas;
}
Set<ReplicaInfo> replicas = new HashSet<>();
volumeMap.replicas(bpid, (iterator) -> {
while (iterator.hasNext()) {
ReplicaInfo b = iterator.next();
replicas.add(b);
}
});
return replicas;
}

/**
Expand Down Expand Up @@ -2169,19 +2167,16 @@ public Map<DatanodeStorage, BlockListAsLongs> getBlockReports(String bpid) {
*/
@Override
public List<ReplicaInfo> getFinalizedBlocks(String bpid) {
try (AutoCloseDataSetLock l = lockManager.readLock(LockLevel.BLOCK_POOl, bpid)) {
ArrayList<ReplicaInfo> finalized =
new ArrayList<>(volumeMap.size(bpid));
volumeMap.replicas(bpid, (iterator) -> {
while (iterator.hasNext()) {
ReplicaInfo b = iterator.next();
if (b.getState() == ReplicaState.FINALIZED) {
finalized.add(new FinalizedReplica((FinalizedReplica)b));
}
ArrayList<ReplicaInfo> finalized = new ArrayList<>();
volumeMap.replicas(bpid, (iterator) -> {
while (iterator.hasNext()) {
ReplicaInfo b = iterator.next();
if (b.getState() == ReplicaState.FINALIZED) {
finalized.add(new FinalizedReplica((FinalizedReplica)b));
}
});
return finalized;
}
}
});
return finalized;
}

/**
Expand Down