[SPARK-18364] : Fixing Code to pass Unit tests

pgandhi · pgandhi · commit 70472a255e5d · 2018-10-05T16:11:43.000-05:00
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
@@ -171,17 +171,6 @@ protected void serviceInit(Configuration conf) throws Exception {
       TransportConf transportConf = new TransportConf("shuffle", new HadoopConfigProvider(conf));
       blockHandler = new ExternalShuffleBlockHandler(transportConf, registeredExecutorFile);
 
-      // register metrics on the block handler into the Node Manager's metrics system.
-      blockHandler.getAllMetrics().getMetrics().put("numRegisteredConnections",
-              shuffleServer.getRegisteredConnections());
-      YarnShuffleServiceMetrics serviceMetrics =
-        new YarnShuffleServiceMetrics(blockHandler.getAllMetrics());
-
-      MetricsSystemImpl metricsSystem = (MetricsSystemImpl) DefaultMetricsSystem.instance();
-      metricsSystem.register(
-        "sparkShuffleService", "Metrics on the Spark Shuffle Service", serviceMetrics);
-      logger.info("Registered metrics with Hadoop's DefaultMetricsSystem");
-
       // If authentication is enabled, set up the shuffle server to use a
       // special RPC handler that filters out unauthenticated fetch requests
       List<TransportServerBootstrap> bootstraps = Lists.newArrayList();
@@ -202,6 +191,18 @@ protected void serviceInit(Configuration conf) throws Exception {
       port = shuffleServer.getPort();
       boundPort = port;
       String authEnabledString = authEnabled ? "enabled" : "not enabled";
+
+      // register metrics on the block handler into the Node Manager's metrics system.
+      blockHandler.getAllMetrics().getMetrics().put("numRegisteredConnections",
+              shuffleServer.getRegisteredConnections());
+      YarnShuffleServiceMetrics serviceMetrics =
+              new YarnShuffleServiceMetrics(blockHandler.getAllMetrics());
+
+      MetricsSystemImpl metricsSystem = (MetricsSystemImpl) DefaultMetricsSystem.instance();
+      metricsSystem.register(
+              "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 {}. " +
         "Authentication is {}.  Registered executor file is {}", port, authEnabledString,
         registeredExecutorFile);
diff --git a/common/network-yarn/src/main/java/org/apache/spark/network/yarn/YarnShuffleServiceMetrics.java b/common/network-yarn/src/main/java/org/apache/spark/network/yarn/YarnShuffleServiceMetrics.java
@@ -113,7 +113,6 @@ public static void collectMetric(
       metricsRecordBuilder.addGauge(new ShuffleServiceMetricsInfo(name, "Number of " +
               "connections to shuffle service " + name), counterValue);
     }
-
   }
 
   private static MetricsInfo getShuffleServiceMetricsInfo(String name) {

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,6 @@ public static void collectMetric(`
`113`	`113`	`metricsRecordBuilder.addGauge(new ShuffleServiceMetricsInfo(name, "Number of " +`
`114`	`114`	`"connections to shuffle service " + name), counterValue);`
`115`	`115`	`}`
`116`		`-`
`117`	`116`	`}`
`118`	`117`
`119`	`118`	`private static MetricsInfo getShuffleServiceMetricsInfo(String name) {`