You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2014/06/27 03:17:36 UTC

git commit: Added a default master work directory for local runs.

Repository: mesos
Updated Branches:
  refs/heads/master 8e812b787 -> cc41082d0


Added a default master work directory for local runs.

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


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

Branch: refs/heads/master
Commit: cc41082d06be4a92c122a49442ca37bec5e18a5d
Parents: 8e812b7
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Thu Jun 26 17:06:44 2014 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu Jun 26 17:22:12 2014 -0700

----------------------------------------------------------------------
 src/local/local.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/cc41082d/src/local/local.cpp
----------------------------------------------------------------------
diff --git a/src/local/local.cpp b/src/local/local.cpp
index e05a225..9db4dd1 100644
--- a/src/local/local.cpp
+++ b/src/local/local.cpp
@@ -26,6 +26,7 @@
 
 #include <stout/exit.hpp>
 #include <stout/foreach.hpp>
+#include <stout/os.hpp>
 #include <stout/path.hpp>
 #include <stout/try.hpp>
 #include <stout/strings.hpp>
@@ -135,8 +136,13 @@ PID<Master> launch(const Flags& flags, Allocator* _allocator)
       }
       storage = new state::InMemoryStorage();
     } else if (flags.registry == "replicated_log") {
+      // For local runs, we use a temporary work directory.
       if (flags.work_dir.isNone()) {
-        EXIT(1) << "--work_dir needed for replicated log based registry";
+        CHECK_SOME(os::mkdir("/tmp/mesos/local"));
+
+        Try<string> directory = os::mkdtemp("/tmp/mesos/local/XXXXXX");
+        CHECK_SOME(directory);
+        flags.work_dir = directory.get();
       }
 
       // TODO(vinod): Add support for replicated log with ZooKeeper.