[SPARK-18364] : Addressing Reviews December 20, 2018

pgandhi · pgandhi · commit 3c5ef99dc727 · 2018-12-20T11:06:39.000-06:00
Calling superclass methods from overrided methods and fixing indentation.
diff --git a/common/network-common/src/main/java/org/apache/spark/network/server/TransportChannelHandler.java b/common/network-common/src/main/java/org/apache/spark/network/server/TransportChannelHandler.java
@@ -181,13 +181,15 @@ public TransportResponseHandler getResponseHandler() {
   }
 
   @Override
-  public void channelRegistered(ChannelHandlerContext ctx) {
+  public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
     transportContext.getRegisteredConnections().inc();
+    super.channelRegistered(ctx);
   }
 
   @Override
-  public void channelUnregistered(ChannelHandlerContext ctx) {
+  public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
     transportContext.getRegisteredConnections().dec();
+    super.channelUnregistered(ctx);
   }
 
 }
diff --git a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandler.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandler.java
@@ -255,11 +255,13 @@ public ManagedBuffer next() {
   @Override
   public void channelActive(TransportClient client) {
     metrics.activeConnections.inc();
+    super.channelActive(client);
   }
 
   @Override
   public void channelInactive(TransportClient client) {
     metrics.activeConnections.dec();
+    super.channelInactive(client);
   }
 
 }
diff --git a/common/network-yarn/src/main/java/org/apache/spark/network/yarn/YarnShuffleService.java b/common/network-yarn/src/main/java/org/apache/spark/network/yarn/YarnShuffleService.java
@@ -194,13 +194,13 @@ protected void serviceInit(Configuration conf) throws Exception {
 
       // register metrics on the block handler into the Node Manager's metrics system.
       blockHandler.getAllMetrics().getMetrics().put("numRegisteredConnections",
-              shuffleServer.getRegisteredConnections());
+          shuffleServer.getRegisteredConnections());
       YarnShuffleServiceMetrics serviceMetrics =
-              new YarnShuffleServiceMetrics(blockHandler.getAllMetrics());
+          new YarnShuffleServiceMetrics(blockHandler.getAllMetrics());
 
       MetricsSystemImpl metricsSystem = (MetricsSystemImpl) DefaultMetricsSystem.instance();
       metricsSystem.register(
-              "sparkShuffleService", "Metrics on the Spark Shuffle Service", serviceMetrics);
+          "sparkShuffleService", "Metrics on the Spark Shuffle Service", serviceMetrics);
       logger.info("Registered metrics with Hadoop's DefaultMetricsSystem");
 
       logger.info("Started YARN shuffle service for Spark on port {}. " +

Original file line number	Diff line number	Diff line change
`@@ -181,13 +181,15 @@ public TransportResponseHandler getResponseHandler() {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`@Override`
`184`		`- public void channelRegistered(ChannelHandlerContext ctx) {`
	`184`	`+ public void channelRegistered(ChannelHandlerContext ctx) throws Exception {`
`185`	`185`	`transportContext.getRegisteredConnections().inc();`
	`186`	`+ super.channelRegistered(ctx);`
`186`	`187`	`}`
`187`	`188`
`188`	`189`	`@Override`
`189`		`- public void channelUnregistered(ChannelHandlerContext ctx) {`
	`190`	`+ public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {`
`190`	`191`	`transportContext.getRegisteredConnections().dec();`
	`192`	`+ super.channelUnregistered(ctx);`
`191`	`193`	`}`
`192`	`194`
`193`	`195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -255,11 +255,13 @@ public ManagedBuffer next() {`
`255`	`255`	`@Override`
`256`	`256`	`public void channelActive(TransportClient client) {`
`257`	`257`	`metrics.activeConnections.inc();`
	`258`	`+ super.channelActive(client);`
`258`	`259`	`}`
`259`	`260`
`260`	`261`	`@Override`
`261`	`262`	`public void channelInactive(TransportClient client) {`
`262`	`263`	`metrics.activeConnections.dec();`
	`264`	`+ super.channelInactive(client);`
`263`	`265`	`}`
`264`	`266`
`265`	`267`	`}`