Skip to content

Commit a801799

Browse files
committed
Mentioned need for custom module in file-based secrets docs; formatting.
1 parent b2a3675 commit a801799

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

docs/running-on-mesos.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,9 @@ See the [configuration page](configuration.html) for information on Spark config
503503
spark.mesos.driver.secret.names or spark.mesos.driver.secret.values will be
504504
written to the provided file. Paths are relative to the container's work
505505
directory. Absolute paths must already exist. Consult the Mesos Secret
506-
protobuf for more information. Example:
506+
protobuf for more information. Note: File-based secrets require a custom
507+
<a href="http://mesos.apache.org/documentation/latest/secrets/">SecretResolver
508+
module</a>. Example:
507509

508510
<pre>filename1,filename2</pre>
509511
</td>
@@ -548,7 +550,9 @@ See the [configuration page](configuration.html) for information on Spark config
548550
spark.mesos.executor.secret.names or spark.mesos.executor.secret.values will be
549551
written to the provided file. Paths are relative to the container's work
550552
directory. Absolute paths must already exist. Consult the Mesos Secret
551-
protobuf for more information. Example:
553+
protobuf for more information. Note: File-based secrets require a custom
554+
<a href="http://mesos.apache.org/documentation/latest/secrets/">SecretResolver
555+
module</a>. Example:
552556

553557
<pre>filename1,filename2</pre>
554558
</td>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ private[mesos] object MesosSchedulerBackendUtil extends Logging {
127127
}
128128

129129
def buildContainerInfo(conf: SparkConf):
130-
ContainerInfo.Builder = {
130+
ContainerInfo.Builder = {
131131
val containerType = if (conf.contains("spark.mesos.executor.docker.image") &&
132132
conf.get("spark.mesos.containerizer", "docker") == "docker") {
133133
ContainerInfo.Type.DOCKER
@@ -242,7 +242,7 @@ private[mesos] object MesosSchedulerBackendUtil extends Logging {
242242
}
243243

244244
def getSecretEnvVar(conf: SparkConf, secretConfig: MesosSecretConfig):
245-
List[Variable] = {
245+
List[Variable] = {
246246
val secrets = getSecrets(conf, secretConfig)
247247
val secretEnvKeys = conf.get(secretConfig.SECRET_ENVKEYS).getOrElse(Nil)
248248
if (illegalSecretInput(secretEnvKeys, secrets)) {

0 commit comments

Comments
 (0)