[2/2] mesos git commit: Fixed a bug regarding setting work_dir for a local cluster.

[ji...@apache.org]

Fixed a bug regarding setting work_dir for a local cluster.

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


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

Branch: refs/heads/master
Commit: 2037099d6d95ef8d99d971e47cfd75968543d972
Parents: 743e9e7
Author: Jie Yu <yu...@gmail.com>
Authored: Wed Apr 8 11:32:28 2015 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Apr 10 14:56:36 2015 -0700

----------------------------------------------------------------------
 src/local/local.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/2037099d/src/local/local.cpp
----------------------------------------------------------------------
diff --git a/src/local/local.cpp b/src/local/local.cpp
index 1908336..289b9bc 100644
--- a/src/local/local.cpp
+++ b/src/local/local.cpp
@@ -287,6 +287,9 @@ PID<Master> launch(const Flags& flags, Allocator* _allocator)
               << "slave flags from the environment: " << load.error();
     }
 
+    // Use a different work directory for each slave.
+    flags.work_dir = path::join(flags.work_dir, stringify(i));
+
     garbageCollectors->push_back(new GarbageCollector());
     statusUpdateManagers->push_back(new StatusUpdateManager(flags));
     fetchers->push_back(new Fetcher());
@@ -298,9 +301,6 @@ PID<Master> launch(const Flags& flags, Allocator* _allocator)
       EXIT(1) << "Failed to create a containerizer: " << containerizer.error();
     }
 
-    // Use a different work directory for each slave.
-    flags.work_dir = path::join(flags.work_dir, stringify(i));
-
     // NOTE: At this point detector is already initialized by the
     // Master.
     Slave* slave = new Slave(