diff options
| author | Aaron Davidson <aaron@databricks.com> | 2013-10-10 00:32:58 -0700 |
|---|---|---|
| committer | Aaron Davidson <aaron@databricks.com> | 2013-10-10 00:33:47 -0700 |
| commit | 42d8b8efe68f6f81af5ed31a046138f9dad5be4a (patch) | |
| tree | b9d60a0c8de72c47e0f81ab91350072502ac3ce2 /core | |
| parent | 4ea8ee468fb1f50fce56853a5127a89efc45b706 (diff) | |
| download | spark-42d8b8efe68f6f81af5ed31a046138f9dad5be4a.tar.gz spark-42d8b8efe68f6f81af5ed31a046138f9dad5be4a.tar.bz2 spark-42d8b8efe68f6f81af5ed31a046138f9dad5be4a.zip | |
Address Matei's comments on documentation
Updates to the documentation and changing some logError()s to logWarning()s.
Diffstat (limited to 'core')
3 files changed, 10 insertions, 6 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/client/Client.scala b/core/src/main/scala/org/apache/spark/deploy/client/Client.scala index 0d4682fcc1..77422f61ec 100644 --- a/core/src/main/scala/org/apache/spark/deploy/client/Client.scala +++ b/core/src/main/scala/org/apache/spark/deploy/client/Client.scala @@ -67,7 +67,7 @@ private[spark] class Client( registerWithMaster() } catch { case e: Exception => - logError("Failed to connect to master", e) + logWarning("Failed to connect to master", e) markDisconnected() context.stop(self) } @@ -141,15 +141,15 @@ private[spark] class Client( sender ! MasterChangeAcknowledged(appId) case Terminated(actor_) if actor_ == master => - logError("Connection to master failed; waiting for master to reconnect...") + logWarning("Connection to master failed; waiting for master to reconnect...") markDisconnected() case RemoteClientDisconnected(transport, address) if address == masterAddress => - logError("Connection to master failed; waiting for master to reconnect...") + logWarning("Connection to master failed; waiting for master to reconnect...") markDisconnected() case RemoteClientShutdown(transport, address) if address == masterAddress => - logError("Connection to master failed; waiting for master to reconnect...") + logWarning("Connection to master failed; waiting for master to reconnect...") markDisconnected() case StopClient => diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ZooKeeperPersistenceEngine.scala b/core/src/main/scala/org/apache/spark/deploy/master/ZooKeeperPersistenceEngine.scala index 13a6b627bf..a0233a7271 100644 --- a/core/src/main/scala/org/apache/spark/deploy/master/ZooKeeperPersistenceEngine.scala +++ b/core/src/main/scala/org/apache/spark/deploy/master/ZooKeeperPersistenceEngine.scala @@ -22,7 +22,11 @@ import org.apache.zookeeper._ import akka.serialization.Serialization -class ZooKeeperPersistenceEngine(serialization: Serialization) extends PersistenceEngine with SparkZooKeeperWatcher with Logging { +class ZooKeeperPersistenceEngine(serialization: Serialization) + extends PersistenceEngine + with SparkZooKeeperWatcher + with Logging +{ val WORKING_DIR = System.getProperty("spark.deploy.zookeeper.dir", "/spark") + "/master_status" val zk = new SparkZooKeeperSession(this) diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala index 8a3017e964..cb88159b8d 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala @@ -71,7 +71,7 @@ private[spark] class SparkDeploySchedulerBackend( override def disconnected() { if (!stopping) { - logError("Disconnected from Spark cluster! Waiting for reconnection...") + logWarning("Disconnected from Spark cluster! Waiting for reconnection...") } } |