You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2017/08/22 01:33:06 UTC
[2/3] mesos git commit: Renamed CONTAINERS_DIR to EXECUTOR_RUNS_DIR.
Renamed CONTAINERS_DIR to EXECUTOR_RUNS_DIR.
`CONTAINERS_DIR` will be used more accurately as the variable
for "containers", rather than "runs".
Review: https://reviews.apache.org/r/61805
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b6549bd4
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b6549bd4
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b6549bd4
Branch: refs/heads/master
Commit: b6549bd4ba061b35227bc28e26e36d7d087e33d5
Parents: 3b95dc9
Author: Joseph Wu <jo...@apache.org>
Authored: Mon Aug 21 10:56:01 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Mon Aug 21 18:00:50 2017 -0700
----------------------------------------------------------------------
src/slave/paths.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b6549bd4/src/slave/paths.cpp
----------------------------------------------------------------------
diff --git a/src/slave/paths.cpp b/src/slave/paths.cpp
index eb6a28e..1a6943f 100644
--- a/src/slave/paths.cpp
+++ b/src/slave/paths.cpp
@@ -69,7 +69,7 @@ const char RESOURCES_TARGET_FILE[] = "resources.target";
const char SLAVES_DIR[] = "slaves";
const char FRAMEWORKS_DIR[] = "frameworks";
const char EXECUTORS_DIR[] = "executors";
-const char CONTAINERS_DIR[] = "runs";
+const char EXECUTOR_RUNS_DIR[] = "runs";
Try<ExecutorRunPath> parseExecutorRunPath(
@@ -103,7 +103,7 @@ Try<ExecutorRunPath> parseExecutorRunPath(
if (tokens[0] == SLAVES_DIR &&
tokens[2] == FRAMEWORKS_DIR &&
tokens[4] == EXECUTORS_DIR &&
- tokens[6] == CONTAINERS_DIR) {
+ tokens[6] == EXECUTOR_RUNS_DIR) {
ExecutorRunPath path;
path.slaveId.set_value(tokens[1]);
@@ -248,7 +248,7 @@ Try<list<string>> getExecutorRunPaths(
{
return fs::list(path::join(
getExecutorPath(rootDir, slaveId, frameworkId, executorId),
- CONTAINERS_DIR,
+ EXECUTOR_RUNS_DIR,
"*"));
}
@@ -262,7 +262,7 @@ string getExecutorRunPath(
{
return path::join(
getExecutorPath(rootDir, slaveId, frameworkId, executorId),
- CONTAINERS_DIR,
+ EXECUTOR_RUNS_DIR,
stringify(containerId));
}
@@ -311,7 +311,7 @@ string getExecutorLatestRunPath(
{
return path::join(
getExecutorPath(rootDir, slaveId, frameworkId, executorId),
- CONTAINERS_DIR,
+ EXECUTOR_RUNS_DIR,
LATEST_SYMLINK);
}