[hadoop] 01/02: Revert "first commit (#2559)"

[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