[SPARK-18364][YARN] YarnShuffleService code style corrections

mareksimunek · mareksimunek · commit e259b6f899ab · 2018-09-25T15:25:03.000+02: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
@@ -176,7 +176,7 @@ protected void serviceInit(Configuration conf) throws Exception {
 
       MetricsSystemImpl metricsSystem = (MetricsSystemImpl) DefaultMetricsSystem.instance();
       metricsSystem.register(
-        "shuffleService", "Metrics on the Spark Shuffle Service", serviceMetrics);
+        "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
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
@@ -17,17 +17,17 @@
 
 package org.apache.spark.network.yarn;
 
+import java.util.Map;
+
 import com.codahale.metrics.*;
 import org.apache.hadoop.metrics2.MetricsCollector;
 import org.apache.hadoop.metrics2.MetricsInfo;
 import org.apache.hadoop.metrics2.MetricsRecordBuilder;
 import org.apache.hadoop.metrics2.MetricsSource;
-import org.apache.spark.network.shuffle.ExternalShuffleBlockHandler;
-
-import java.util.Map;
 
 /**
- * Forward {@link ExternalShuffleBlockHandler.ShuffleMetrics} to hadoop metrics system.
+ * Forward {@link org.apache.spark.network.shuffle.ExternalShuffleBlockHandler.ShuffleMetrics}
+ * to hadoop metrics system.
  * NodeManager by default exposes JMX endpoint where can be collected.
  */
 class YarnShuffleServiceMetrics implements MetricsSource {
@@ -46,17 +46,21 @@ class YarnShuffleServiceMetrics implements MetricsSource {
    */
   @Override
   public void getMetrics(MetricsCollector collector, boolean all) {
-    MetricsRecordBuilder metricsRecordBuilder = collector.addRecord("shuffleService");
+    MetricsRecordBuilder metricsRecordBuilder = collector.addRecord("sparkShuffleService");
 
     for (Map.Entry<String, Metric> entry : metricSet.getMetrics().entrySet()) {
       collectMetric(metricsRecordBuilder, entry.getKey(), entry.getValue());
     }
   }
 
   /**
-   * The metric types used in {@link ExternalShuffleBlockHandler.ShuffleMetrics}
+   * The metric types used in
+   * {@link org.apache.spark.network.shuffle.ExternalShuffleBlockHandler.ShuffleMetrics}.
+   * Visible for testing.
    */
-  public static void collectMetric(MetricsRecordBuilder metricsRecordBuilder, String name, Metric metric) {
+  public static void collectMetric(
+    MetricsRecordBuilder metricsRecordBuilder, String name, Metric metric) {
+
     if (metric instanceof Timer) {
       Timer t = (Timer) metric;
       metricsRecordBuilder
