checkstyle

Author: RuinanGu

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java

@@ -1040,13 +1040,16 @@ public static BlockECReconstructionInfo convertBlockECReconstructionInfo(
 
     byte[] liveBlkIndices = blockEcReconstructionInfoProto.getLiveBlockIndices()
         .toByteArray();
-    byte[] excludeReconstructedIndices=blockEcReconstructionInfoProto.getExcludeReconstructedIndices()
-        .toByteArray();
+    byte[] excludeReconstructedIndices =
+            blockEcReconstructionInfoProto.getExcludeReconstructedIndices()
+            .toByteArray();
     ErasureCodingPolicy ecPolicy =
         PBHelperClient.convertErasureCodingPolicy(
             blockEcReconstructionInfoProto.getEcPolicy());
-    return new BlockECReconstructionInfo(block, sourceDnInfos, targetDnInfos,
-        targetStorageUuids, convertStorageTypes, liveBlkIndices, excludeReconstructedIndices, ecPolicy);
+    return new BlockECReconstructionInfo(
+        block, sourceDnInfos, targetDnInfos,
+        targetStorageUuids, convertStorageTypes, liveBlkIndices,
+        excludeReconstructedIndices, ecPolicy);
   }
 
   public static BlockECReconstructionInfoProto convertBlockECRecoveryInfo(
@@ -1073,7 +1076,8 @@ public static BlockECReconstructionInfoProto convertBlockECRecoveryInfo(
     builder.setLiveBlockIndices(PBHelperClient.getByteString(liveBlockIndices));
 
     byte[] excludeReconstructedIndices = blockEcRecoveryInfo.getExcludeReconstructedIndices();
-    builder.setExcludeReconstructedIndices(PBHelperClient.getByteString(excludeReconstructedIndices));
+    builder.setExcludeReconstructedIndices(
+        PBHelperClient.getByteString(excludeReconstructedIndices));
 
     builder.setEcPolicy(PBHelperClient.convertErasureCodingPolicy(
         blockEcRecoveryInfo.getErasureCodingPolicy()));

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java

@@ -2478,7 +2478,7 @@ DatanodeDescriptor[] chooseSourceDatanodes(BlockInfo block,
       List<DatanodeDescriptor> containingNodes,
       List<DatanodeStorageInfo> nodesContainingLiveReplicas,
       NumberReplicas numReplicas, List<Byte> liveBlockIndices,
-      List<Byte> liveBusyBlockIndices, List<Byte> ExcludeReconstructed , int priority) {
+      List<Byte> liveBusyBlockIndices, List<Byte> excludeReconstructed, int priority) {
     containingNodes.clear();
     nodesContainingLiveReplicas.clear();
     List<DatanodeDescriptor> srcNodes = new ArrayList<>();
@@ -2549,7 +2549,7 @@ DatanodeDescriptor[] chooseSourceDatanodes(BlockInfo block,
             || state == StoredReplicaState.DECOMMISSIONING)) {
           liveBusyBlockIndices.add(blockIndex);
           //HDFS-16566 ExcludeReconstructed won't be reconstructed
-          ExcludeReconstructed.add(blockIndex);
+          excludeReconstructed.add(blockIndex);
         }
         continue; // already reached replication limit
       }

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java

@@ -683,7 +683,7 @@ public void addBlockToBeReplicated(Block block,
    */
   void addBlockToBeErasureCoded(ExtendedBlock block,
       DatanodeDescriptor[] sources, DatanodeStorageInfo[] targets,
-      byte[] liveBlockIndices,byte[] excludeReconstrutedIndices, ErasureCodingPolicy ecPolicy) {
+      byte[] liveBlockIndices, byte[] excludeReconstrutedIndices, ErasureCodingPolicy ecPolicy) {
     assert (block != null && sources != null && sources.length > 0);
     BlockECReconstructionInfo task = new BlockECReconstructionInfo(block,
         sources, targets, liveBlockIndices, excludeReconstrutedIndices, ecPolicy);

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReconstructionInfo.java

@@ -61,7 +61,8 @@ public StripedReconstructionInfo(ExtendedBlock blockGroup,
   private StripedReconstructionInfo(ExtendedBlock blockGroup,
       ErasureCodingPolicy ecPolicy, byte[] liveIndices, DatanodeInfo[] sources,
       byte[] targetIndices, DatanodeInfo[] targets,
-      StorageType[] targetStorageTypes, String[] targetStorageIds, byte[] excludeReconstructedIndices) {
+      StorageType[] targetStorageTypes, String[] targetStorageIds,
+      byte[] excludeReconstructedIndices) {
 
     this.blockGroup = blockGroup;
     this.ecPolicy = ecPolicy;

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReconstructStripedFile.java

@@ -471,8 +471,8 @@ public void testProcessErasureCodingTasksSubmitionShouldSucceed()
         targetDnInfos_1 };
 
     BlockECReconstructionInfo invalidECInfo = new BlockECReconstructionInfo(
-        new ExtendedBlock("bp-id", 123456), dataDNs, dnStorageInfo, liveIndices,new byte[0],
-        ecPolicy);
+        new ExtendedBlock("bp-id", 123456), dataDNs, dnStorageInfo, liveIndices,
+        new byte[0], ecPolicy);
     List<BlockECReconstructionInfo> ecTasks = new ArrayList<>();
     ecTasks.add(invalidECInfo);
     dataNode.getErasureCodingWorker().processErasureCodingTasks(ecTasks);

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReconstructStripedBlocks.java

@@ -453,7 +453,7 @@ public void testReconstrutionWithBusyBlock1() throws Exception {
     int writeBytes = cellSize * dataBlocks;
     HdfsConfiguration conf=new HdfsConfiguration();
     initConf(conf);
-    conf.setBoolean(DFSConfigKeys.DFS_DISK_BALANCER_ENABLED,false);
+    conf.setBoolean(DFSConfigKeys.DFS_DISK_BALANCER_ENABLED, false);
     conf.setInt(DFSConfigKeys.DFS_NAMENODE_HEARTBEAT_RECHECK_INTERVAL_KEY,
             2000);
     conf.setInt(DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY, 1);
@@ -501,18 +501,16 @@ public void testReconstrutionWithBusyBlock1() throws Exception {
     cluster.setDataNodeDead(dn.getDatanodeId());
 
     //3.Whether there is excess replicas or not during the recovery?
-    assertEquals(8,bm.countNodes(blockInfo).liveReplicas());
+    assertEquals(8, bm.countNodes(blockInfo).liveReplicas());
 
     GenericTestUtils.waitFor(
-            () -> {
-                System.out.println(bm.countNodes(blockInfo).liveReplicas());
-                System.out.println(bm.countNodes(blockInfo).excessReplicas());
-              return bm.countNodes(blockInfo).liveReplicas()==9||bm.countNodes(blockInfo).excessReplicas() >= 1||bm.countNodes(blockInfo).redundantInternalBlocks() >= 1;
-            },
-            10, 100000);
-
-    assertEquals(0,bm.countNodes(blockInfo).excessReplicas());
-    assertEquals(9,bm.countNodes(blockInfo).liveReplicas());
+      () -> {
+        return bm.countNodes(blockInfo).liveReplicas()==9||bm.countNodes(blockInfo).excessReplicas() >= 1||bm.countNodes(blockInfo).redundantInternalBlocks() >= 1;
+      },
+      10, 100000);
+
+    assertEquals(0, bm.countNodes(blockInfo).excessReplicas());
+    assertEquals(9, bm.countNodes(blockInfo).liveReplicas());
   }
 
 }