Fix checkstyle issues

Author: Danny Becker

hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClientFaultInjector.java

@@ -69,7 +69,8 @@ public void sleepBeforeHedgedGet() {}
 
   public void delayWhenRenewLeaseTimeout() {}
 
-  public void onCreateBlockReader(LocatedBlock block, int chunkIndex, long offset, long length) throws IOException {}
+  public void onCreateBlockReader(LocatedBlock block, int chunkIndex,
+      long offset, long length) throws IOException {}
 
   public void failCreateBlockReader() throws InvalidBlockTokenException {}
 }

hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSStripedInputStream.java

@@ -52,7 +52,6 @@
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
@@ -278,9 +277,8 @@ private long getSleepingTimestamp(int attempts) {
    * @return True if the {@param block} is on a sleeping node, otherwise false.
    */
   protected boolean isBlockOnSleepingNode(LocatedBlock block) {
-    Collection<DatanodeInfo> sleepingNodes = checkSleepingNodes();
     DNAddrPair dnInfo = getBestNodeDNAddrPair(block, null);
-    return dnInfo != null && sleepingNodes.contains(dnInfo.info);
+    return dnInfo != null && checkSleepingNodes().contains(dnInfo.info);
   }
 
   /**

hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/StripeReader.java

@@ -316,7 +316,7 @@ private synchronized void prepareDecodeInputsInternal() {
   }
 
   /**
-   * Decide which chunks to transition from READY to REQUESTED
+   * Decide which chunks to transition from READY to REQUESTED.
    */
   private void requestChunks() throws IOException {
     if (alignedStripe.getReadyChunksNum() > 0 &&
@@ -408,8 +408,8 @@ void readStripe() throws IOException {
             alignedStripe.setFetched(r.index);
             updateState4SuccessRead(r);
           } else {
-            if (r.exception instanceof ExecutionException &&
-                !(r.exception.getCause() instanceof ChecksumException)) {
+            if (r.getException() instanceof ExecutionException &&
+                !(r.getException().getCause() instanceof ChecksumException)) {
               if (dfsStripedInputStream.updateSleepingNodes(
                   readerInfos[r.index].datanode)) {
                 alignedStripe.setSleeping(r.index);

hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/util/StripedBlockUtil.java

@@ -718,7 +718,7 @@ public static class AlignedStripe {
     private Map<Integer, Integer> parityStateCounts = new HashMap<>();
 
     /**
-     * Get the state of the chunk, or null if the chunk is null
+     * Get the state of the chunk, or null if the chunk is null.
      * @param chunkIndex The chunk to get the state of
      * @return The state of the chunk at {@param chunkIndex}, or null if the
      * chunk at {@param chunkIndex} is null
@@ -1008,9 +1008,9 @@ public static class StripingChunk {
      * all-zero bytes in codec calculations.
      */
     public static final int ALLZERO = 0X0f;
-    /** Chunk fetch was attempted and it is now sleeping until retry **/
+    /** Chunk fetch was attempted and it is now sleeping until retry. **/
     public static final int SLEEPING = 0xf1;
-    /** Chunk is ready to start reading **/
+    /** Chunk is ready to start reading. **/
     public static final int READY = 0xf2;
 
     /**
@@ -1024,7 +1024,15 @@ public static class StripingChunk {
      * null (AlignedStripe created) -&gt; READY (upon failure) -&gt; REQUESTED
      *  -&gt; {SLEEPING | PENDING} ...
      */
-    public int state = READY;
+    private int state = READY;
+
+    public int getState() {
+      return state;
+    }
+
+    public void setState(int state) {
+      this.state = state;
+    }
 
     private final ChunkByteBuffer chunkBuffer;
     private final ByteBuffer byteBuffer;
@@ -1126,9 +1134,13 @@ public static class StripingChunkReadResult {
 
     public final int index;
     public final int state;
-    public final Exception exception;
+    private final Exception exception;
     private final BlockReadStats readStats;
 
+    public Exception getException() {
+      return exception;
+    }
+
     public StripingChunkReadResult(int state) {
       Preconditions.checkArgument(state == TIMEOUT,
           "Only timeout result should return negative index.");

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

@@ -377,12 +377,12 @@ public void onCreateBlockReader(LocatedBlock block, int chunkIndex,
     try (FSDataInputStream in = fs.open(srcPath)) {
       long start = Time.monotonicNow();
       Assert.assertThrows(IOException.class, () -> {
-          StripedFileTestUtil
-              .verifyPread(in, fileLength, expected, largeBuf, ecPolicy);
+        StripedFileTestUtil
+            .verifyPread(in, fileLength, expected, largeBuf, ecPolicy);
       });
       long timeMs = Time.monotonicNow() - start;
       Assert.assertTrue("Read should have been slower than 10 seconds but was "
-                            + timeMs + " ms",timeMs > 10000);
+                            + timeMs + " ms", timeMs > 10000);
     }
     try (FSDataInputStream in = fs.open(srcPath)) {
       ExecutorService service = Executors.newSingleThreadExecutor();
@@ -401,7 +401,7 @@ public void onCreateBlockReader(LocatedBlock block, int chunkIndex,
           .verifyPread(in, fileLength, expected, largeBuf, ecPolicy);
       long timeMs = Time.monotonicNow() - start;
       Assert.assertTrue("Read should have been slower than 10 seconds but was "
-          + timeMs + " ms",timeMs > 10000);
+          + timeMs + " ms", timeMs > 10000);
       long decodingTimeNanos =
           ((HdfsDataInputStream) in).getReadStatistics().getTotalEcDecodingTimeNanos();
       // Should read without any decoding
@@ -427,7 +427,7 @@ public void onCreateBlockReader(LocatedBlock block, int chunkIndex,
       // Should read with decoding
       long timeMs = Time.monotonicNow() - start;
       Assert.assertTrue("Read should have been slower than 10 seconds but was "
-          + timeMs + " ms",timeMs > 10000);
+          + timeMs + " ms", timeMs > 10000);
       long decodingTimeNanos =
           ((HdfsDataInputStream) in).getReadStatistics().getTotalEcDecodingTimeNanos();
       // Should read without any decoding