diff options
| author | Raymond Liu <raymond.liu@intel.com> | 2013-12-16 14:39:37 +0800 |
|---|---|---|
| committer | Raymond Liu <raymond.liu@intel.com> | 2014-01-03 12:12:37 +0800 |
| commit | e867e31145b100997232720399155d158241b125 (patch) | |
| tree | da91690d644ee7d9d1d01f5b64d9b08664f774d7 /yarn | |
| parent | 8818661721a2705a0f3d9aff6187f2eee12aa2eb (diff) | |
| download | spark-e867e31145b100997232720399155d158241b125.tar.gz spark-e867e31145b100997232720399155d158241b125.tar.bz2 spark-e867e31145b100997232720399155d158241b125.zip | |
some code clean up for Yarn 2.2
Diffstat (limited to 'yarn')
| -rw-r--r-- | yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala | 4 | ||||
| -rw-r--r-- | yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala b/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala index 99b824e129..191ef798d7 100644 --- a/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala +++ b/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/WorkerLauncher.scala @@ -56,7 +56,7 @@ class WorkerLauncher(args: ApplicationMasterArguments, conf: Configuration) exte // This actor just working as a monitor to watch on Driver Actor. class MonitorActor(driverUrl: String) extends Actor { - var driver: ActorSelection = null + var driver: ActorSelection = _ override def preStart() { logInfo("Listen to driver: " + driverUrl) @@ -66,7 +66,7 @@ class WorkerLauncher(args: ApplicationMasterArguments, conf: Configuration) exte override def receive = { case x: DisassociatedEvent => - logInfo("Driver terminated or disconnected! Shutting down.") + logInfo("Driver terminated or disconnected! Shutting down. $x") driverClosed = true } } diff --git a/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala b/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala index 85ab08ef34..8a9a73f5b4 100644 --- a/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala +++ b/yarn/2.2/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala @@ -42,7 +42,7 @@ import org.apache.hadoop.yarn.client.api.AMRMClient.ContainerRequest import org.apache.hadoop.yarn.util.{RackResolver, Records} -object AllocationType extends Enumeration ("HOST", "RACK", "ANY") { +object AllocationType extends Enumeration { type AllocationType = Value val HOST, RACK, ANY = Value } |