[mesos] branch 1.7.x updated: Marked HDFS image fetching as experimental.

[ch...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

chhsiao pushed a commit to branch 1.7.x
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/1.7.x by this push:
     new 972313b  Marked HDFS image fetching as experimental.
972313b is described below

commit 972313b5e28cc0155844f105df9cc279222bfb36
Author: Chun-Hung Hsiao <ch...@mesosphere.io>
AuthorDate: Tue Aug 21 11:27:18 2018 -0700

    Marked HDFS image fetching as experimental.
    
    Review: https://reviews.apache.org/r/68445
---
 docs/configuration/agent.md | 6 +++---
 docs/container-image.md     | 5 ++++-
 src/slave/flags.cpp         | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/docs/configuration/agent.md b/docs/configuration/agent.md
index bcddea2..0f0f910 100644
--- a/docs/configuration/agent.md
+++ b/docs/configuration/agent.md
@@ -654,11 +654,11 @@ recovers.
   </td>
   <td>
 The default url for Mesos containerizer to pull Docker images. It could
-either be a Docker registry server url (i.e: <code>https://registry.docker.io</code>),
+either be a Docker registry server url (e.g., <code>https://registry.docker.io</code>),
 or a source that Docker image archives (result of <code>docker save</code>) are
 stored. The Docker archive source could be specified either as a local
-path (i.e: <code>/tmp/docker/images</code>), or as an HDFS URI
-(i.e: <code>hdfs://localhost:8020/archives/</code>). Note that this option won't
+path (e.g., <code>/tmp/docker/images</code>), or as an HDFS URI (*experimental*)
+(e.g., <code>hdfs://localhost:8020/archives/</code>). Note that this option won't
 change the default registry server for Docker containerizer.
 (default: https://registry-1.docker.io)
   </td>
diff --git a/docs/container-image.md b/docs/container-image.md
index 7342f23..3c4520a 100644
--- a/docs/container-image.md
+++ b/docs/container-image.md
@@ -226,7 +226,10 @@ example, the operator can put a `busybox:latest.tar` (the result of
 `/tmp/mesos/images/docker` and launch the agent by specifying
 `--docker_registry=/tmp/mesos/images/docker`. Then the framework can
 launch a Docker container by specifying `busybox:latest` as the name
-of the Docker image.
+of the Docker image. This flag can also point to an HDFS URI
+(*experimental* in Mesos 1.7) (e.g., `hdfs://localhost:8020/archives/`)
+to fetch images from HDFS if the `hadoop` command is available on the
+agent.
 
 If the `--switch_user` flag is set on the agent and the framework
 specifies a user (either `CommandInfo.user` or `FrameworkInfo.user`),
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index fd208f6..872e412 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -202,11 +202,11 @@ mesos::internal::slave::Flags::Flags()
   add(&Flags::docker_registry,
       "docker_registry",
       "The default url for Mesos containerizer to pull Docker images. It\n"
-      "could either be a Docker registry server url (i.e: `https://registry.docker.io`),\n" // NOLINT(whitespace/line_length)
+      "could either be a Docker registry server url (e.g., `https://registry.docker.io`),\n" // NOLINT(whitespace/line_length)
       "or a source that Docker image archives (result of `docker save`) are\n"
       "stored. The Docker archive source could be specified either as a local\n"
-      "path (i.e: `/tmp/docker/images`), or as an HDFS URI\n"
-      "(i.e: `hdfs://localhost:8020/archives/`). Note that this option won't\n"
+      "path (e.g., `/tmp/docker/images`), or as an HDFS URI (*experimental*)\n"
+      "(e.g., `hdfs://localhost:8020/archives/`). Note that this option won't\n"
       "change the default registry server for Docker containerizer.",
       "https://registry-1.docker.io");