From 3fe33a29064dcc06e8deebfeec2045af4a44dfed Mon Sep 17 00:00:00 2001 From: Ding Fei Date: Mon, 26 Sep 2016 21:01:33 +0800 Subject: [PATCH 1/2] Fixing comment since Actor is not used anymore. --- .../scala/org/apache/spark/deploy/worker/WorkerWatcher.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/WorkerWatcher.scala b/core/src/main/scala/org/apache/spark/deploy/worker/WorkerWatcher.scala index af29de3b0896e..4153b60220793 100644 --- a/core/src/main/scala/org/apache/spark/deploy/worker/WorkerWatcher.scala +++ b/core/src/main/scala/org/apache/spark/deploy/worker/WorkerWatcher.scala @@ -21,7 +21,7 @@ import org.apache.spark.internal.Logging import org.apache.spark.rpc._ /** - * Actor which connects to a worker process and terminates the JVM if the connection is severed. + * WorkerWatcher RpcEndpoint which connects to a worker process and terminates the JVM if the connection is severed. * Provides fate sharing between a worker and its associated child processes. */ private[spark] class WorkerWatcher( From dbaf93c96f130e78f6386479cc275223384294eb Mon Sep 17 00:00:00 2001 From: Ding Fei Date: Tue, 27 Sep 2016 11:10:00 +0800 Subject: [PATCH 2/2] Fix two comments since Actor is not used anymore. --- .../scala/org/apache/spark/deploy/worker/WorkerWatcher.scala | 3 ++- .../test/scala/org/apache/spark/MapOutputTrackerSuite.scala | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/WorkerWatcher.scala b/core/src/main/scala/org/apache/spark/deploy/worker/WorkerWatcher.scala index 4153b60220793..23efcab6caad1 100644 --- a/core/src/main/scala/org/apache/spark/deploy/worker/WorkerWatcher.scala +++ b/core/src/main/scala/org/apache/spark/deploy/worker/WorkerWatcher.scala @@ -21,7 +21,8 @@ import org.apache.spark.internal.Logging import org.apache.spark.rpc._ /** - * WorkerWatcher RpcEndpoint which connects to a worker process and terminates the JVM if the connection is severed. + * Endpoint which connects to a worker process and terminates the JVM if the + * connection is severed. * Provides fate sharing between a worker and its associated child processes. */ private[spark] class WorkerWatcher( diff --git a/core/src/test/scala/org/apache/spark/MapOutputTrackerSuite.scala b/core/src/test/scala/org/apache/spark/MapOutputTrackerSuite.scala index c6aebc19fd12d..bb24c6ce4d33c 100644 --- a/core/src/test/scala/org/apache/spark/MapOutputTrackerSuite.scala +++ b/core/src/test/scala/org/apache/spark/MapOutputTrackerSuite.scala @@ -253,7 +253,7 @@ class MapOutputTrackerSuite extends SparkFunSuite { rpcEnv.stop(masterTracker.trackerEndpoint) rpcEnv.setupEndpoint(MapOutputTracker.ENDPOINT_NAME, masterEndpoint) - // Frame size should be ~1.1MB, and MapOutputTrackerMasterActor should throw exception. + // Frame size should be ~1.1MB, and MapOutputTrackerMasterEndpoint should throw exception. // Note that the size is hand-selected here because map output statuses are compressed before // being sent. masterTracker.registerShuffle(20, 100)