You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by we...@apache.org on 2021/02/22 10:36:09 UTC
[hadoop] branch trunk updated (1b94569 -> 1e32ab7)
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git.
from 1b94569 first commit (#2559)
new f8059d0 Revert "first commit (#2559)"
new 1e32ab7 HDFS-15734. [READ] DirectoryScanner#scan need not check StorageType.PROVIDED (#2559)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 02/02: HDFS-15734. [READ] DirectoryScanner#scan need not
check StorageType.PROVIDED (#2559)
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 1e32ab7d2fa83ad4119954b32a3a8daac9d08134
Author: Wang Yuxuan <60...@qq.com>
AuthorDate: Mon Feb 22 18:10:39 2021 +0800
HDFS-15734. [READ] DirectoryScanner#scan need not check StorageType.PROVIDED (#2559)
Co-authored-by: wangyuxuan <wa...@xiaomi.com>
---
.../java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
index 66cfa01..8e33171 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
@@ -506,8 +506,7 @@ public class DirectoryScanner implements Runnable {
}
// Block file and/or metadata file exists on the disk
// Block exists in memory
- if (info.getVolume().getStorageType() != StorageType.PROVIDED
- && info.getBlockFile() == null) {
+ if (info.getBlockFile() == null) {
// Block metadata file exits and block file is missing
addDifference(diffRecord, statsRecord, info);
} else if (info.getGenStamp() != memBlock.getGenerationStamp()
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[hadoop] 01/02: Revert "first commit (#2559)"
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit f8059d0bdfbd741b40fff276aaa7f5a4ca633c38
Author: Wei-Chiu Chuang <we...@apache.org>
AuthorDate: Mon Feb 22 18:13:06 2021 +0800
Revert "first commit (#2559)"
This reverts commit 1b94569d893ca54ba86ad67340e2e9db27252e0f.
---
.../java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
index 8e33171..66cfa01 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
@@ -506,7 +506,8 @@ public class DirectoryScanner implements Runnable {
}
// Block file and/or metadata file exists on the disk
// Block exists in memory
- if (info.getBlockFile() == null) {
+ if (info.getVolume().getStorageType() != StorageType.PROVIDED
+ && info.getBlockFile() == null) {
// Block metadata file exits and block file is missing
addDifference(diffRecord, statsRecord, info);
} else if (info.getGenStamp() != memBlock.getGenerationStamp()
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org