diff options
| author | Harold Lim <harold@cs.duke.edu> | 2013-03-08 15:44:36 -0500 |
|---|---|---|
| committer | Andrew xia <junluan.xia@intel.com> | 2013-03-12 13:31:27 +0800 |
| commit | 0b64e5f1ac0492aac6fca383c7877fbfce7d4cf1 (patch) | |
| tree | ad9ca26ad9f93ab0ed277de6104212a070f91f83 /core | |
| parent | f5b1fecb9fc2e7d389810bfff5298f42b313f208 (diff) | |
| download | spark-0b64e5f1ac0492aac6fca383c7877fbfce7d4cf1.tar.gz spark-0b64e5f1ac0492aac6fca383c7877fbfce7d4cf1.tar.bz2 spark-0b64e5f1ac0492aac6fca383c7877fbfce7d4cf1.zip | |
Removed some commented code
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/spark/SparkContext.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/main/scala/spark/SparkContext.scala b/core/src/main/scala/spark/SparkContext.scala index f6ee399898..6eccb501c7 100644 --- a/core/src/main/scala/spark/SparkContext.scala +++ b/core/src/main/scala/spark/SparkContext.scala @@ -144,7 +144,7 @@ class SparkContext( new LocalScheduler(threads.toInt, maxFailures.toInt, this) case SPARK_REGEX(sparkUrl) => - val scheduler = new ClusterScheduler(this)//Class.forName(System.getProperty("spark.cluster.taskscheduler")).getConstructors()(0).newInstance(Array[AnyRef](this):_*).asInstanceOf[ClusterScheduler] + val scheduler = new ClusterScheduler(this) val backend = new SparkDeploySchedulerBackend(scheduler, this, sparkUrl, appName) val taskSetQueuesManager = Class.forName(System.getProperty("spark.cluster.taskscheduler")).newInstance().asInstanceOf[TaskSetQueuesManager] scheduler.initialize(backend, taskSetQueuesManager) @@ -161,7 +161,7 @@ class SparkContext( memoryPerSlaveInt, sparkMemEnvInt)) } - val scheduler = new ClusterScheduler(this)//Class.forName(System.getProperty("spark.cluster.taskscheduler")).getConstructors()(0).newInstance(Array[AnyRef](this):_*).asInstanceOf[ClusterScheduler] + val scheduler = new ClusterScheduler(this) val localCluster = new LocalSparkCluster( numSlaves.toInt, coresPerSlave.toInt, memoryPerSlaveInt) val sparkUrl = localCluster.start() @@ -178,7 +178,7 @@ class SparkContext( logWarning("Master %s does not match expected format, parsing as Mesos URL".format(master)) } MesosNativeLibrary.load() - val scheduler = new ClusterScheduler(this)//Class.forName(System.getProperty("spark.cluster.taskscheduler")).getConstructors()(0).newInstance(Array[AnyRef](this):_*).asInstanceOf[ClusterScheduler] + val scheduler = new ClusterScheduler(this) val coarseGrained = System.getProperty("spark.mesos.coarse", "false").toBoolean val masterWithoutProtocol = master.replaceFirst("^mesos://", "") // Strip initial mesos:// val backend = if (coarseGrained) { |