HDFS-17496. DataNode supports more fine-grained dataset lock based on blockid. #7280
+247
−50
Conversation
This file contains 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
|
@Hexiaoqiao @kokon191 @slfan1989 Sir, have updated. We can discuss the new implementation here, thanks a lot. |
|
💔 -1 overall
This message was automatically generated. |
hfutatzhanghb
force-pushed
the
HDFS-17496
branch
from
c95ba06 to
fc61ca4
Compare
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
@Hexiaoqiao Thanks, Sir. have rebuilded this PR and all checks were passed. |
Hexiaoqiao
reviewed
Jan 16, 2025
| */ | ||
| public static String idToBlockDirSuffixName(long blockId) { | ||
| int d1 = (int) ((blockId >> 16) & 0x1F); | ||
| int d2 = (int) ((blockId >> 8) & 0x1F); |
There was a problem hiding this comment.
How do we explain the operation blockId >> 16 and blockId >> 8 here? Do you mean the same way with idToBlockDir? If that, I think it is better to use the common method to implement it.
+ public static String idToBlockDirSuffix(long blockId) {
+ int d1 = (int) ((blockId >> 16) & 0x1F);
+ int d2 = (int) ((blockId >> 8) & 0x1F);
+ return DataStorage.BLOCK_SUBDIR_PREFIX + d1 + SEP +
+ DataStorage.BLOCK_SUBDIR_PREFIX + d2;
+ }
+
/**
* Get the directory where a finalized block with this ID should be stored.
* Do not attempt to create the directory.
@@ -120,10 +127,7 @@ public static boolean dirNoFilesRecursive(
* @return
*/
public static File idToBlockDir(File root, long blockId) {
- int d1 = (int) ((blockId >> 16) & 0x1F);
- int d2 = (int) ((blockId >> 8) & 0x1F);
- String path = DataStorage.BLOCK_SUBDIR_PREFIX + d1 + SEP +
- DataStorage.BLOCK_SUBDIR_PREFIX + d2;
+ String path = idToBlockDirSuffix(blockId);
return new File(root, path);
}
There was a problem hiding this comment.
@Hexiaoqiao yes, blockId >> 16 and blockId >> 8 are the the same way with idToBlockDir.
Have refactor those methods and make literal 0x1F to be a static final field in DatanodeUtil.
Thanks a lot for your suggestions.
kokon191
suggested changes
Jan 16, 2025
| */ | ||
| String blockIdToSubLock(long blockid); | ||
|
|
||
| List<String> getAllSubLockName(); |
...s-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DatanodeUtil.java
Outdated
Show resolved
Hide resolved
...s-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DatanodeUtil.java
Outdated
Show resolved
Hide resolved
...ject/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/common/DataNodeLockManager.java
Show resolved
Hide resolved
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
@aajisaka Sir, could you please help me solve this problem? Thanks. |
hfutatzhanghb
force-pushed
the
HDFS-17496
branch
from
5e370fc to
413a9bd
Compare
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
@Hexiaoqiao @slfan1989 @ayushtkn @aajisaka Sir, we meet build problems here. PTAL, thanks a lot. [ERROR] Failed to execute goal org.apache.maven.plugins:maven-javadoc-plugin:3.0.1:javadoc-no-fork (default-cli) on project hadoop-hdfs: An error has occurred in Javadoc report generation:
[ERROR] Exit code: 1 - javadoc: warning - The code being documented uses modules but the packages defined in https://docs.oracle.com/javase/8/docs/api/ are in the unnamed module. |
|
💔 -1 overall
This message was automatically generated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of PR
More detailed infomation please refer to #6764
Major differences from origin are below:
1、 Remove class ModDataSetSubLockStrategy and add a new class DataNodeLayoutSubLockStrategy
2、Add util methods in DatanodeUtil.
3、Add javadoc for method DatanodeUtil#idToBlockDir.