You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/12/13 01:09:56 UTC

[3/5] mesos git commit: Made some IOSwitchboardServer flags optional.

Made some IOSwitchboardServer flags optional.

Although these flags are now optional, we actually require them to be
set when executing the mesos-io-switchbaord binary. We add a check to
make sure they are set properly.

Review: https://reviews.apache.org/r/54681


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1d733457
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1d733457
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1d733457

Branch: refs/heads/master
Commit: 1d73345744c7db0ab9fcbc72eff4a044ed63afd5
Parents: ec805dd
Author: Jie Yu <yu...@gmail.com>
Authored: Mon Dec 12 15:39:54 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Dec 12 16:23:08 2016 -0800

----------------------------------------------------------------------
 .../containerizer/mesos/io/switchboard.cpp      |  5 ++-
 .../containerizer/mesos/io/switchboard.hpp      | 30 ++++++--------
 .../containerizer/mesos/io/switchboard_main.cpp | 42 +++++++++++++-------
 3 files changed, 43 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/1d733457/src/slave/containerizer/mesos/io/switchboard.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/io/switchboard.cpp b/src/slave/containerizer/mesos/io/switchboard.cpp
index d541470..0122974 100644
--- a/src/slave/containerizer/mesos/io/switchboard.cpp
+++ b/src/slave/containerizer/mesos/io/switchboard.cpp
@@ -595,7 +595,8 @@ Future<Option<ContainerLaunchInfo>> IOSwitchboard::_prepare(
   }
 
   LOG(INFO) << "Created I/O switchboard server (pid: " << child->pid()
-            << ") listening on socket file '" << switchboardFlags.socket_path
+            << ") listening on socket file '"
+            << switchboardFlags.socket_path.get()
             << "' for container " << containerId;
 
   close(ioSwitchboardFds);
@@ -612,7 +613,7 @@ Future<Option<ContainerLaunchInfo>> IOSwitchboard::_prepare(
       flags.runtime_dir, containerId);
 
   Try<Nothing> checkpointed = slave::state::checkpoint(
-      path, switchboardFlags.socket_path);
+      path, switchboardFlags.socket_path.get());
 
   if (checkpointed.isError()) {
     close(openedFds);

http://git-wip-us.apache.org/repos/asf/mesos/blob/1d733457/src/slave/containerizer/mesos/io/switchboard.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/io/switchboard.hpp b/src/slave/containerizer/mesos/io/switchboard.hpp
index 9072f88..ec109bf 100644
--- a/src/slave/containerizer/mesos/io/switchboard.hpp
+++ b/src/slave/containerizer/mesos/io/switchboard.hpp
@@ -157,30 +157,25 @@ public:
 
       add(&Flags::stdin_to_fd,
           "stdin_to_fd",
-          "The file descriptor where incoming stdin data should be written.",
-          -1);
+          "The file descriptor where incoming stdin data should be written.");
 
       add(&Flags::stdout_from_fd,
           "stdout_from_fd",
-          "The file descriptor that should be read to consume stdout data.",
-          -1);
+          "The file descriptor that should be read to consume stdout data.");
 
       add(&Flags::stdout_to_fd,
           "stdout_to_fd",
           "A file descriptor where data read from\n"
-          "'stdout_from_fd' should be redirected to.",
-          -1);
+          "'stdout_from_fd' should be redirected to.");
 
       add(&Flags::stderr_from_fd,
           "stderr_from_fd",
-          "The file descriptor that should be read to consume stderr data.",
-          -1);
+          "The file descriptor that should be read to consume stderr data.");
 
       add(&Flags::stderr_to_fd,
           "stderr_to_fd",
           "A file descriptor where data read from\n"
-          "'stderr_from_fd' should be redirected to.",
-          -1);
+          "'stderr_from_fd' should be redirected to.");
 
       add(&Flags::wait_for_connection,
           "wait_for_connection",
@@ -191,8 +186,7 @@ public:
       add(&Flags::socket_path,
           "socket_address",
           "The path of the unix domain socket this\n"
-          "io switchboard should attach itself to.",
-          "");
+          "io switchboard should attach itself to.");
 
       add(&Flags::heartbeat_interval,
           "heartbeat_interval",
@@ -201,12 +195,12 @@ public:
     }
 
     bool tty;
-    int stdin_to_fd;
-    int stdout_from_fd;
-    int stdout_to_fd;
-    int stderr_from_fd;
-    int stderr_to_fd;
-    std::string socket_path;
+    Option<int> stdin_to_fd;
+    Option<int> stdout_from_fd;
+    Option<int> stdout_to_fd;
+    Option<int> stderr_from_fd;
+    Option<int> stderr_to_fd;
+    Option<std::string> socket_path;
     bool wait_for_connection;
     Option<Duration> heartbeat_interval;
   };

http://git-wip-us.apache.org/repos/asf/mesos/blob/1d733457/src/slave/containerizer/mesos/io/switchboard_main.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/io/switchboard_main.cpp b/src/slave/containerizer/mesos/io/switchboard_main.cpp
index 4cac59e..87056c3 100644
--- a/src/slave/containerizer/mesos/io/switchboard_main.cpp
+++ b/src/slave/containerizer/mesos/io/switchboard_main.cpp
@@ -62,19 +62,33 @@ int main(int argc, char** argv)
 
   // Load and validate flags from the environment and command line.
   Try<flags::Warnings> load = flags.load(None(), &argc, &argv);
-
   if (load.isError()) {
     EXIT(EXIT_FAILURE) << flags.usage(load.error());
   }
 
   // Verify non-optional flags have valid values.
-  if (flags.stdin_to_fd == -1 ||
-      flags.stdout_from_fd == -1 ||
-      flags.stdout_to_fd == -1 ||
-      flags.stderr_from_fd == -1 ||
-      flags.stderr_to_fd == -1 ||
-      flags.socket_path == "") {
-    EXIT(EXIT_FAILURE) << "Illegal value in flags: " << stringify(flags);
+  if (flags.stdin_to_fd.isNone()) {
+    EXIT(EXIT_FAILURE) << flags.usage("'--stdin_to_fd' is missing");
+  }
+
+  if (flags.stdout_from_fd.isNone()) {
+    EXIT(EXIT_FAILURE) << flags.usage("'--stdout_from_fd' is missing");
+  }
+
+  if (flags.stdout_to_fd.isNone()) {
+    EXIT(EXIT_FAILURE) << flags.usage("'--stdout_to_fd' is missing");
+  }
+
+  if (flags.stderr_from_fd.isNone()) {
+    EXIT(EXIT_FAILURE) << flags.usage("'--stderr_from_fd' is missing");
+  }
+
+  if (flags.stderr_to_fd.isNone()) {
+    EXIT(EXIT_FAILURE) << flags.usage("'--stderr_to_fd' is missing");
+  }
+
+  if (flags.socket_path.isNone()) {
+    EXIT(EXIT_FAILURE) << flags.usage("'--socket_path' is missing");
   }
 
   Try<Nothing> pipe = os::pipe(unblockFds);
@@ -90,12 +104,12 @@ int main(int argc, char** argv)
 
   Try<Owned<IOSwitchboardServer>> server = IOSwitchboardServer::create(
       flags.tty,
-      flags.stdin_to_fd,
-      flags.stdout_from_fd,
-      flags.stdout_to_fd,
-      flags.stderr_from_fd,
-      flags.stderr_to_fd,
-      flags.socket_path,
+      flags.stdin_to_fd.get(),
+      flags.stdout_from_fd.get(),
+      flags.stdout_to_fd.get(),
+      flags.stderr_from_fd.get(),
+      flags.stderr_to_fd.get(),
+      flags.socket_path.get(),
       flags.wait_for_connection,
       flags.heartbeat_interval);