Skip to content

Commit c2d0e04

Browse files
committed
Address review comment from dongjoon-hyun
1 parent c156fe0 commit c2d0e04

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

resource-managers/mesos/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ private[spark] class MesosClusterScheduler(
390390
private def getDriverEnvironment(desc: MesosDriverDescription): Environment = {
391391
// TODO(mgummelt): Don't do this here. This should be passed as a --conf
392392
val commandEnv = adjust(desc.command.environment, "SPARK_SUBMIT_OPTS", "")(
393-
v => s"$v -Dspark.mesos.driver.frameworkId=${getDriverFrameworkID(desc)}"
393+
v => s"$v -D${config.DRIVER_FRAMEWORK_ID.key}=${getDriverFrameworkID(desc)}"
394394
)
395395

396396
val env = desc.conf.getAllWithPrefix(config.DRIVER_ENV_PREFIX) ++ commandEnv
@@ -423,7 +423,7 @@ private[spark] class MesosClusterScheduler(
423423
case "container" => true
424424
case "host" => false
425425
case other =>
426-
logWarning(s"Unknown spark.mesos.appJar.local.resolution.mode $other, using host.")
426+
logWarning(s"Unknown ${config.APPLICATION_JAR_LOCAL_RESOLUTION_MODE} $other, using host.")
427427
false
428428
}
429429
isLocalJar && isContainerLocal

resource-managers/mesos/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerUtils.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,8 +554,8 @@ trait MesosSchedulerUtils extends Logging {
554554
* framework ID, the driver calls this method after the first registration.
555555
*/
556556
def unsetFrameworkID(sc: SparkContext) {
557-
sc.conf.remove("spark.mesos.driver.frameworkId")
558-
System.clearProperty("spark.mesos.driver.frameworkId")
557+
sc.conf.remove(mesosConfig.DRIVER_FRAMEWORK_ID)
558+
System.clearProperty(mesosConfig.DRIVER_FRAMEWORK_ID.key)
559559
}
560560

561561
def mesosToTaskState(state: MesosTaskState): TaskState.TaskState = state match {

0 commit comments

Comments
 (0)