HADOOP-18242. checkstyle + merge conflicts

Author: mehakmeet

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3ABlockOutputStream.java

@@ -461,7 +461,7 @@ public void close() throws IOException {
    */
   private synchronized void cleanupOnClose() {
     cleanupWithLogger(LOG, getActiveBlock(), blockFactory);
-    mergeThreadIOStatistics(threadIOStatistics);
+    mergeThreadIOStatistics(statistics.getIOStatistics());
     LOG.debug("Statistics: {}", statistics);
     cleanupWithLogger(LOG, statistics);
     clearActiveBlock();
@@ -471,11 +471,11 @@ private synchronized void cleanupOnClose() {
    * Merging the current thread's IOStatistics with the current IOStatistics
    * context.
    *
-   * @param threadIOStatistics thread IOStatistics to be merged.
+   * @param streamStatistics Stream statistics to be merged into thread
+   *                         statistics aggregator.
    */
-  private void mergeThreadIOStatistics(
-      IOStatisticsAggregator threadIOStatistics) {
-    threadIOStatistics.aggregate(statistics.getIOStatistics());
+  private void mergeThreadIOStatistics(IOStatistics streamStatistics) {
+    threadIOStatistics.aggregate(streamStatistics);
     currentIOStatisticsContext().setThreadIOStatistics(threadIOStatistics);
   }
 

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AInputStream.java

@@ -37,7 +37,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.hadoop.classification.VisibleForTesting;
 import org.apache.hadoop.fs.statistics.IOStatisticsAggregator;
 import org.apache.hadoop.util.Preconditions;
 import org.apache.hadoop.classification.InterfaceAudience;
@@ -58,7 +57,6 @@
 import org.apache.hadoop.fs.statistics.IOStatistics;
 import org.apache.hadoop.fs.statistics.IOStatisticsSource;
 import org.apache.hadoop.io.IOUtils;
-import org.apache.hadoop.util.Preconditions;
 import org.apache.hadoop.util.functional.CallableRaisingIOE;
 
 import static java.util.Objects.requireNonNull;
@@ -609,7 +607,7 @@ public synchronized void close() throws IOException {
         // close or abort the stream; blocking
         awaitFuture(closeStream("close() operation", false, true));
         // Collect ThreadLevel IOStats
-        mergeThreadIOStatistics(threadIOStatistics);
+        mergeThreadIOStatistics(streamStatistics.getIOStatistics());
         LOG.debug("Statistics of stream {}\n{}", key, streamStatistics);
         // end the client+audit span.
         client.close();
@@ -626,10 +624,11 @@ public synchronized void close() throws IOException {
    * Merging the current thread's IOStatistics with the current IOStatistics
    * context.
    *
-   * @param threadIOStatistics thread IOStatistics to be merged.
+   * @param streamIOStats Stream statistics to be merged into thread
+   *                      statistics aggregator.
    */
-  private void mergeThreadIOStatistics(IOStatisticsAggregator threadIOStatistics) {
-    threadIOStatistics.aggregate(streamStatistics.getIOStatistics());
+  private void mergeThreadIOStatistics(IOStatistics streamIOStats) {
+    threadIOStatistics.aggregate(streamIOStats);
     currentIOStatisticsContext().setThreadIOStatistics(threadIOStatistics);
   }
 

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AIOStatisticsContext.java

@@ -225,7 +225,7 @@ public void testThreadIOStatisticsForDifferentThreads()
     }
 
     // Worker thread work and wait for it to finish.
-    testWorkerThread workerThread = new testWorkerThread();
+    TestWorkerThread workerThread = new TestWorkerThread();
     long workerThreadID = workerThread.getId();
     workerThread.start();
     workerThread.join();
@@ -307,7 +307,7 @@ private void assertThreadStatisticsForThread(long testThreadId,
   /**
    * Simulating doing some work in a separate thread.
    */
-  private class testWorkerThread extends Thread implements Runnable {
+  private class TestWorkerThread extends Thread implements Runnable {
     @Override
     public void run() {
       S3AFileSystem fs = getFileSystem();