You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2014/08/16 20:48:15 UTC
[1/3] git commit: Removing unnecessary argument (same as default).
Repository: mesos
Updated Branches:
refs/heads/master 49dcd833e -> b1f3b9a0e
Removing unnecessary argument (same as default).
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b1f3b9a0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b1f3b9a0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b1f3b9a0
Branch: refs/heads/master
Commit: b1f3b9a0eb2fc2b0de51ea354a0cd4225f6ab32b
Parents: 65083fb
Author: Benjamin Hindman <be...@gmail.com>
Authored: Sat Aug 16 11:41:22 2014 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Sat Aug 16 11:47:46 2014 -0700
----------------------------------------------------------------------
src/slave/containerizer/docker.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b1f3b9a0/src/slave/containerizer/docker.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp
index b1b9e9f..fe5b291 100644
--- a/src/slave/containerizer/docker.cpp
+++ b/src/slave/containerizer/docker.cpp
@@ -806,7 +806,7 @@ Future<bool> DockerContainerizerProcess::launch(
}
if (user.isSome()) {
- Try<Nothing> chown = os::chown(user.get(), directory, true);
+ Try<Nothing> chown = os::chown(user.get(), directory);
if (chown.isError()) {
return Failure("Failed to chown: " + chown.error());
@@ -1047,7 +1047,7 @@ Future<bool> DockerContainerizerProcess::launch(
}
if (user.isSome()) {
- Try<Nothing> chown = os::chown(user.get(), directory, true);
+ Try<Nothing> chown = os::chown(user.get(), directory);
if (chown.isError()) {
return Failure("Failed to chown: " + chown.error());
[3/3] git commit: Simplified a test by using FUTURE_DISPATCH.
Posted by be...@apache.org.
Simplified a test by using FUTURE_DISPATCH.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/66aebe2c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/66aebe2c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/66aebe2c
Branch: refs/heads/master
Commit: 66aebe2cd8de4f44e827ae835e67d8c8d5a9ee9b
Parents: 49dcd83
Author: Benjamin Hindman <be...@gmail.com>
Authored: Sat Aug 16 11:36:16 2014 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Sat Aug 16 11:47:46 2014 -0700
----------------------------------------------------------------------
src/tests/docker_containerizer_tests.cpp | 35 +++++++--------------------
1 file changed, 9 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/66aebe2c/src/tests/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp
index c37bc52..8ead090 100644
--- a/src/tests/docker_containerizer_tests.cpp
+++ b/src/tests/docker_containerizer_tests.cpp
@@ -1550,6 +1550,14 @@ TEST_F(DockerContainerizerTest, DISABLED_ROOT_DOCKER_SlaveRecoveryExecutorContai
Invoke(dockerContainerizer1,
&MockDockerContainerizer::_launchExecutor)));
+ // We need to wait until the container's pid has been been
+ // checkpointed so that when the next slave recovers it won't treat
+ // the executor as having gone lost! We know this has completed
+ // after Containerizer::launch returns and the
+ // Slave::executorLaunched gets dispatched.
+ Future<Nothing> executorLaunched =
+ FUTURE_DISPATCH(_, &Slave::executorLaunched);
+
// The test-executor in the image immediately sends a TASK_RUNNING
// followed by TASK_FINISHED (no sleep/delay in between) so we need
// to drop the first TWO updates that come from the executor rather
@@ -1567,32 +1575,7 @@ TEST_F(DockerContainerizerTest, DISABLED_ROOT_DOCKER_SlaveRecoveryExecutorContai
AWAIT_READY(containerId);
AWAIT_READY(slaveId);
- // We also need to wait until the container's pid has been been
- // checkpointed so that when the next slave recovers it won't treat
- // the executor as having gone lost!
- string path = slave::paths::getForkedPidPath(
- slave::paths::getMetaRootDir(flags.work_dir),
- slaveId.get(),
- frameworkId.get(),
- executorId,
- containerId.get());
-
- Duration waited = Duration::zero();
- do {
- if (os::exists(path)) {
- Try<string> read = os::read(path);
- if (read.isSome() && read.get() != "") {
- break;
- }
- }
- os::sleep(Milliseconds(100));
- waited += Milliseconds(100);
- } while (waited < Seconds(3));
-
- ASSERT_TRUE(os::exists(path));
- ASSERT_SOME_NE("", os::read(path));
-
- // Stop the slave before the status update is received.
+ AWAIT_READY(executorLaunched);
AWAIT_READY(statusUpdateMessage1);
AWAIT_READY(statusUpdateMessage2);
[2/3] git commit: Fix for some style issues.
Posted by be...@apache.org.
Fix for some style issues.
Review: https://reviews.apache.org/r/24773
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/65083fb0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/65083fb0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/65083fb0
Branch: refs/heads/master
Commit: 65083fb05267b3cf54941c5f2e63e535090fcbc9
Parents: 66aebe2
Author: Timothy Chen <tn...@apache.org>
Authored: Sat Aug 16 11:38:43 2014 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Sat Aug 16 11:47:46 2014 -0700
----------------------------------------------------------------------
src/slave/containerizer/docker.cpp | 2 +-
src/tests/docker_containerizer_tests.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/65083fb0/src/slave/containerizer/docker.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp
index 215c2b4..b1b9e9f 100644
--- a/src/slave/containerizer/docker.cpp
+++ b/src/slave/containerizer/docker.cpp
@@ -494,7 +494,7 @@ Future<Nothing> DockerContainerizerProcess::_pull(
CHECK_SOME(s.err());
return io::read(s.err().get())
.then(defer(self(), &Self::__pull, s, lambda::_1));
- }
+}
Future<Nothing> DockerContainerizerProcess::__pull(
http://git-wip-us.apache.org/repos/asf/mesos/blob/65083fb0/src/tests/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp
index 8ead090..8654f9c 100644
--- a/src/tests/docker_containerizer_tests.cpp
+++ b/src/tests/docker_containerizer_tests.cpp
@@ -1466,7 +1466,8 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_SlaveRecoveryTaskContainer)
// parse and can even properly use for sending other messages, but the
// current implementation of 'UPID::operator bool ()' fails if the IP
// component of a PID is '0'.
-TEST_F(DockerContainerizerTest, DISABLED_ROOT_DOCKER_SlaveRecoveryExecutorContainer)
+TEST_F(DockerContainerizerTest,
+ DISABLED_ROOT_DOCKER_SlaveRecoveryExecutorContainer)
{
Try<PID<Master> > master = StartMaster();
ASSERT_SOME(master);