diff options
| author | Josh Rosen <joshrosen@databricks.com> | 2016-07-25 12:43:44 -0700 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2016-07-25 12:43:44 -0700 |
| commit | fc17121d592acbd7405135cd576bafc5c574650e (patch) | |
| tree | ea2cd031ad9617c06c44b595eab17f42baf0dbd7 /docs | |
| parent | 3b6e1d094e153599e158331b10d33d74a667be5a (diff) | |
| download | spark-fc17121d592acbd7405135cd576bafc5c574650e.tar.gz spark-fc17121d592acbd7405135cd576bafc5c574650e.tar.bz2 spark-fc17121d592acbd7405135cd576bafc5c574650e.zip | |
Revert "[SPARK-15271][MESOS] Allow force pulling executor docker images"
This reverts commit 978cd5f125eb5a410bad2e60bf8385b11cf1b978.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/_config.yml | 2 | ||||
| -rw-r--r-- | docs/running-on-mesos.md | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/docs/_config.yml b/docs/_config.yml index bbb576e0e7..be3d8a2fe6 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -18,6 +18,6 @@ SPARK_VERSION: 2.1.0-SNAPSHOT SPARK_VERSION_SHORT: 2.1.0 SCALA_BINARY_VERSION: "2.11" SCALA_VERSION: "2.11.7" -MESOS_VERSION: 0.22.0 +MESOS_VERSION: 0.21.0 SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK SPARK_GITHUB_URL: https://github.com/apache/spark diff --git a/docs/running-on-mesos.md b/docs/running-on-mesos.md index ce888b5445..10dc9ce890 100644 --- a/docs/running-on-mesos.md +++ b/docs/running-on-mesos.md @@ -260,10 +260,6 @@ have Mesos download Spark via the usual methods. Requires Mesos version 0.20.1 or later. -Note that by default Mesos agents will not pull the image if it already exists on the agent. If you use mutable image -tags you can set `spark.mesos.executor.docker.forcePullImage` to `true` in order to force the agent to always pull the -image before running the executor. Force pulling images is only available in Mesos version 0.22 and above. - # Running Alongside Hadoop You can run Spark and Mesos alongside your existing Hadoop cluster by just launching them as a @@ -339,14 +335,6 @@ See the [configuration page](configuration.html) for information on Spark config </td> </tr> <tr> - <td><code>spark.mesos.executor.docker.forcePullImage</code></td> - <td>false</td> - <td> - Force Mesos agents to pull the image specified in <code>spark.mesos.executor.docker.image</code>. - By default Mesos agents will not pull images they already have cached. - </td> -</tr> -<tr> <td><code>spark.mesos.executor.docker.volumes</code></td> <td>(none)</td> <td> |