Skip to content

HDFS-15160. branch-3.2. ReplicaMap, Disk Balancer, Directory Scanner and various FsDatasetImpl methods should use datanode readlock. #3200

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 5 commits into from
Sep 11, 2021
Merged

HDFS-15160. branch-3.2. ReplicaMap, Disk Balancer, Directory Scanner and various FsDatasetImpl methods should use datanode readlock. #3200

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78f395c
HDFS-15150. Introduce read write lock to Datanode. Contributed Stephe…
Feb 11, 2020
3c2285a
HDFS-15160. ReplicaMap, Disk Balancer, Directory Scanner and various …
Jun 30, 2020
dcaccc1
HDFS-15457. TestFsDatasetImpl fails intermittently (#2407)
amahussein Oct 28, 2020
0c20e27
HDFS-15818. Fix TestFsDatasetImpl.testReadLockCanBeDisabledByConfig. …
LeonGao91 Feb 9, 2021
7bfebda
HDFS-15160. amend to fix javac error supressing unchecked warning
amahussein Aug 31, 2021
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
4 changes: 2 additions & 2 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 @@ -201,16 +201,16 @@ public Block getStoredBlock(String bpid, long blkid)
* The deepCopyReplica call doesn't use the datasetock since it will lead the
* potential deadlock with the {@link FsVolumeList#addBlockPool} call.
*/
@SuppressWarnings("unchecked")
@Override
public Set<? extends Replica> deepCopyReplica(String bpid)
throws IOException {
Set<? extends Replica> replicas = null;
Set<? extends Replica> replicas;
Copy link
Contributor

@brahmareddybattula brahmareddybattula Sep 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can this change relate to trunk also..? Even this can be emptyset

Copy link
Contributor Author

@amahussein amahussein Sep 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @brahmareddybattula
I think we can apply some changes to trunk given that the type casting is unchecked and causes some Javac warnings.
Perhaps we can file another refactoring jira to address these issues on trunk.

Copy link
Contributor

@brahmareddybattula brahmareddybattula Sep 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can please raise jira to track this..?

try (AutoCloseableLock lock = datasetReadLock.acquire()) {
replicas =
new HashSet<>(volumeMap.replicas(bpid) == null ? Collections.EMPTY_SET
: volumeMap.replicas(bpid));
}

return Collections.unmodifiableSet(replicas);
}

Expand Down