fix review comments

apache · Nov 10, 2022 · 6f36b38 · 6f36b38
1 parent 4aa8d45
commit 6f36b38
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...adoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java b/...adoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
@@ -331,17 +331,17 @@ static void closeChannels(ChannelGroup channelGroup) {
       channelGroup.close().awaitUninterruptibly(10, TimeUnit.SECONDS);
     }
 
-    public static ChannelFuture closeAsIdle(Channel channel, int timeout) {
+    public static ChannelFuture closeAsIdle(Channel ch, int timeout) {
       LOG.debug("Closing channel as writer was idle for {} seconds", timeout);
-      return closeChannel(channel);
+      return closeChannel(ch);
     }
 
     public static void channelActive(Channel ch) {
       LOG.debug("Executing channelActive, channel id: {}", ch.id());
     }
 
-    public static void channelInactive(Channel channel) {
-      LOG.debug("Executing channelInactive, channel id: {}", channel.id());
+    public static void channelInactive(Channel ch) {
+      LOG.debug("Executing channelInactive, channel id: {}", ch.id());
     }
   }
 
@@ -1035,7 +1035,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg)
       }
       // Check whether the shuffle version is compatible
       String shuffleVersion = ShuffleHeader.DEFAULT_HTTP_HEADER_VERSION;
-      String httpHeaderName = ShuffleHeader.HTTP_HEADER_NAME;
+      String httpHeaderName = ShuffleHeader.DEFAULT_HTTP_HEADER_NAME;
       if (request.headers() != null) {
         shuffleVersion = request.headers().get(ShuffleHeader.HTTP_HEADER_VERSION);
         httpHeaderName = request.headers().get(ShuffleHeader.HTTP_HEADER_NAME);
@@ -1047,7 +1047,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg)
           !ShuffleHeader.DEFAULT_HTTP_HEADER_VERSION.equals(shuffleVersion)) {
         sendError(ctx, "Incompatible shuffle request version", BAD_REQUEST);
       }
-      final Map<String, List<String>> q = 
+      final Map<String, List<String>> q =
           new QueryStringDecoder(request.uri()).parameters();
       final List<String> keepAliveList = q.get("keepAlive");
       boolean keepAliveParam = false;

diff --git a/...doop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/resources/log4j.properties b/...doop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/resources/log4j.properties
@@ -17,5 +17,5 @@ log4j.threshold=ALL
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2} (%F:%M(%L)) - %m%n
-log4j.logger.io.netty=DEBUG
-log4j.logger.org.apache.hadoop.mapred=DEBUG
+log4j.logger.io.netty=INFO
+log4j.logger.org.apache.hadoop.mapred=INFO