From 1fdffc5467c3be0ceb5127c4cfea710e658f15c8 Mon Sep 17 00:00:00 2001
From: "archit.thakur" <archit.thakur@guavus.com>
Date: Fri, 6 Nov 2015 01:02:50 +0530
Subject: [PATCH] SPARK-7729: review comments - 4.

---
 .../spark/storage/StorageStatusListener.scala   | 17 +++++++----------
 .../storage/StorageStatusListenerSuite.scala    |  6 +++---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/core/src/main/scala/org/apache/spark/storage/StorageStatusListener.scala b/core/src/main/scala/org/apache/spark/storage/StorageStatusListener.scala
index 80f586c52da17..c8577cb6b8273 100644
--- a/core/src/main/scala/org/apache/spark/storage/StorageStatusListener.scala
+++ b/core/src/main/scala/org/apache/spark/storage/StorageStatusListener.scala
@@ -23,13 +23,13 @@ import scala.collection.JavaConverters.collectionAsScalaIterableConverter
 import scala.collection.mutable
 import scala.language.reflectiveCalls
 
+import com.google.common.base.Ticker
+import com.google.common.cache.CacheBuilder
+
 import org.apache.spark.SparkConf
 import org.apache.spark.annotation.DeveloperApi
 import org.apache.spark.scheduler._
 
-import com.google.common.base.Ticker
-import com.google.common.cache.CacheBuilder
-
 /**
  * :: DeveloperApi ::
  * A SparkListener that maintains executor storage status.
@@ -42,12 +42,9 @@ object StorageStatusListener {
 }
 
 @DeveloperApi
-class StorageStatusListener(conf: SparkConf) extends SparkListener {
-  var ticker = Ticker.systemTicker()
-  
-  private [storage] def this(conf: SparkConf, ticker: Ticker) = {
-    this(conf)
-    this.ticker = ticker
+class StorageStatusListener private[storage](conf: SparkConf, ticker: Ticker) {
+  def this(conf: SparkConf) = {
+    this(conf, Ticker.systemTicker())
   }
   
   import StorageStatusListener._
@@ -62,7 +59,7 @@ class StorageStatusListener(conf: SparkConf) extends SparkListener {
     executorIdToStorageStatus.values.toSeq
   }
   
-  def removedExecutorStorageStatusList: Seq[StorageStatus] = synchronized{
+  def removedExecutorStorageStatusList: Seq[StorageStatus] = synchronized {
     removedExecutorIdToStorageStatus.asMap().values().asScala.toSeq
   }
  
diff --git a/core/src/test/scala/org/apache/spark/storage/StorageStatusListenerSuite.scala b/core/src/test/scala/org/apache/spark/storage/StorageStatusListenerSuite.scala
index 7029870649020..72ba25ea6d0b9 100644
--- a/core/src/test/scala/org/apache/spark/storage/StorageStatusListenerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/storage/StorageStatusListenerSuite.scala
@@ -20,13 +20,13 @@ package org.apache.spark.storage
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicLong
 
+import com.google.common.base.Ticker
+import org.scalatest.FunSuite
+
 import org.apache.spark.SparkConf
 import org.apache.spark.Success
 import org.apache.spark.executor.TaskMetrics
 import org.apache.spark.scheduler._
-import org.scalatest.FunSuite
-
-import com.google.common.base.Ticker
 
 /**
  * Test the behavior of StorageStatusListener in response to all relevant events.