-
Notifications
You must be signed in to change notification settings - Fork 9.1k
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.
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
Conversation
💔 -1 overall
This message was automatically generated. |
Thanks @amahussein for your works. |
💔 -1 overall
This message was automatically generated. |
💔 -1 overall
This message was automatically generated. |
Thanks @amahussein for your works. I trigger Yetus and it seems works well. Failed unit test |
@jojochuang Would you mind to have another check? |
💔 -1 overall
This message was automatically generated. |
Thanks @Hexiaoqiao for the review and the feedback. I appreciate it. I intentionally cherry-picked the commits related to the feature so that the PR would be complete. Otherwise, if we did separate PRs for each commit, branch-3.2 would be broken. |
Thanks @amahussein. It is OK for me to squash and check in them together. Just find there are many checks failed reported by Yetus here. Do you mind give another check? |
I will rebase the code changes and push a fresh version. |
9516ddf
to
29a9832
Compare
💔 -1 overall
This message was automatically generated. |
After rebasing, it looks like there are javac checks added to the build that failed it. |
💔 -1 overall
This message was automatically generated. |
…n O'Donnell. Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit d7c136b)
…FsDatasetImpl methods should use datanode readlock. Contributed by Stephen O'Donnell. Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit 2a67e2b)
(cherry picked from commit 98097b8)
…Contributed by Leon Gao (apache#2679) (cherry picked from commit 9434c1e)
610e6e4
to
7bfebda
Compare
💔 -1 overall
This message was automatically generated. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. +1 from my side. Thanks @amahussein
Failed unit tests seems not related to this changes. Would like to wait other guys continue comments before check in.
@amahussein thanks for working on this.. At first glance,it's better to have seperate PR for Each jira backport.It can be easy to review and maintain in future. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
HDFS-15818 changes lgtm.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
HDFS-15150 changes also lgtm.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
HDFS-15160 changes also lgtm.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
HDFS-15457 changes lgtm
@Override | ||
public Set<? extends Replica> deepCopyReplica(String bpid) | ||
throws IOException { | ||
Set<? extends Replica> replicas = null; | ||
Set<? extends Replica> replicas; |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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..?
Hi @Hexiaoqiao, Is this PR ready for merge? |
Will commit to branch-3.2 for a short while if no more comments. |
Committed to branch-3.2. Thanks @amahussein for your works and thanks @brahmareddybattula for your reviews! |
@Hexiaoqiao , There are two issues I want to bring with this merge. Can you please check once.?
|
@brahmareddybattula Good point. Will revert and check in per-commit. Thanks. For version, I forgot we have create branch-3.2.3 already. |
revert squashed commit and cherry-pick single commit for branch-3.2. |
Committed to branch-3.2.3. |
git cherry-pick -x d7c136b9ed6d99e1b03f5b89723b3a20df359ba8
FsDatasetImpl.java.deepCopyReplica
FoldedTreeSet
is not used in branch-3.2git cherry-pick -x 2a67e2b1a0e3a5f91056f5b977ef9c4c07ba6718
ReplicaMap.java
FsDatasetImpl.java.deepCopyReplica
FsDatasetImpl.java.addVolume
different code. I passed the red and write locks totempVolumeMap
DirectoryScanner.scan()
conflict in the entire loop.git cherry-pick -x 98097b8f19789605b9697f6a959da57261e0fe19 9434c1eccc255a25ea5e11f6d8c9e1f83996d6b4