some commit

apache · Sep 20, 2024 · 749a810 · 749a810
1 parent 784f5e3
commit 749a810
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...fs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java b/...fs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
@@ -303,7 +303,7 @@ public LengthInputStream getMetaDataInputStream(ExtendedBlock b)
 
     // The number of volumes required for operation is the total number
     // of volumes minus the number of failed volumes we can tolerate.
-    volFailuresTolerated = datanode.getDnConf().getVolFailuresTolerated();
+    volFailuresTolerated = datanode.getDnConf().getVolFailuresTolerated(); // The value is 0
 
     Collection<StorageLocation> dataLocations = DataNode.getStorageLocations(conf);
     List<VolumeFailureInfo> volumeFailureInfos = getInitialVolumeFailureInfos(
@@ -312,7 +312,7 @@ public LengthInputStream getMetaDataInputStream(ExtendedBlock b)
     volsConfigured = datanode.getDnConf().getVolsConfigured();
     int volsFailed = volumeFailureInfos.size();
 
-    if (volFailuresTolerated < DataNode.MAX_VOLUME_FAILURE_TOLERATED_LIMIT
+    if (volFailuresTolerated < DataNode.MAX_VOLUME_FAILURE_TOLERATED_LIMIT // The value is -1
         || volFailuresTolerated >= volsConfigured) {
       throw new HadoopIllegalArgumentException("Invalid value configured for "
           + "dfs.datanode.failed.volumes.tolerated - " + volFailuresTolerated

diff --git a/...op-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java b/...op-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java
@@ -2169,7 +2169,7 @@ public void testBlockReportSetNoAckBlockToInvalidate() throws Exception {
       cluster.setDataNodeDead(datanode.getDatanodeId());
       assertFalse(blockManager.containsInvalidateBlock(loc[0], lb.getBlock().getLocalBlock()));
 
-      // Wait for re-registration and heartbeat.
+      // Wait for re, -registration and heartbeat.
       datanode.setHeartbeatsDisabledForTests(false);
       final DatanodeDescriptor dn1Desc = cluster.getNamesystem(0)
           .getBlockManager().getDatanodeManager()