You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2018/02/09 01:24:16 UTC
[1/2] mesos git commit: Fixed two slave recovery tests.
Repository: mesos
Updated Branches:
refs/heads/1.5.x 2efd2b9ce -> ae4f94a8e
Fixed two slave recovery tests.
These two tests are affected by the lingering executor fix
(#65109). We should wait to make sure tasks are actually launched
on the executor before trigger the agent failover. Otherwise, the
container will be shutdown upon re-registration because the executor
has never received any task.
Review: https://reviews.apache.org/r/65572/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/01bb8e72
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/01bb8e72
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/01bb8e72
Branch: refs/heads/1.5.x
Commit: 01bb8e72d6bfa43be96a7be07d272ae1f280e675
Parents: 2efd2b9
Author: Meng Zhu <mz...@mesosphere.io>
Authored: Thu Feb 8 17:19:48 2018 -0800
Committer: Vinod Kone <vi...@gmail.com>
Committed: Thu Feb 8 17:23:54 2018 -0800
----------------------------------------------------------------------
src/tests/slave_recovery_tests.cpp | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/01bb8e72/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 871a801..d84748c 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -5125,7 +5125,11 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceForward)
// Scheduler expectations.
EXPECT_CALL(sched, registered(_, _, _));
+ Future<TaskStatus> statusStarting;
+ Future<TaskStatus> statusRunning;
EXPECT_CALL(sched, statusUpdate(_, _))
+ .WillOnce(FutureArg<1>(&statusStarting))
+ .WillOnce(FutureArg<1>(&statusRunning))
.WillRepeatedly(Return());
Future<vector<Offer>> offers1;
@@ -5157,6 +5161,13 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceForward)
ContainerID containerId = *(containers->begin());
+ // Wait until task is running.
+ AWAIT_READY(statusStarting);
+ EXPECT_EQ(TASK_STARTING, statusStarting->state());
+
+ AWAIT_READY(statusRunning);
+ EXPECT_EQ(TASK_RUNNING, statusRunning->state());
+
// Stop the slave.
slave.get()->terminate();
@@ -5229,7 +5240,11 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceBackward)
// Scheduler expectations.
EXPECT_CALL(sched, registered(_, _, _));
+ Future<TaskStatus> statusStarting;
+ Future<TaskStatus> statusRunning;
EXPECT_CALL(sched, statusUpdate(_, _))
+ .WillOnce(FutureArg<1>(&statusStarting))
+ .WillOnce(FutureArg<1>(&statusRunning))
.WillRepeatedly(Return());
Future<vector<Offer>> offers1;
@@ -5261,6 +5276,13 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PidNamespaceBackward)
ContainerID containerId = *(containers->begin());
+ // Wait until task is running.
+ AWAIT_READY(statusStarting);
+ EXPECT_EQ(TASK_STARTING, statusStarting->state());
+
+ AWAIT_READY(statusRunning);
+ EXPECT_EQ(TASK_RUNNING, statusRunning->state());
+
// Stop the slave.
slave.get()->terminate();
[2/2] mesos git commit: Added MESOS-8552 to the 1.5.1 CHANGELOG.
Posted by vi...@apache.org.
Added MESOS-8552 to the 1.5.1 CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ae4f94a8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ae4f94a8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ae4f94a8
Branch: refs/heads/1.5.x
Commit: ae4f94a8e429ca0628bb5accff37e7757706e5b4
Parents: 01bb8e7
Author: Vinod Kone <vi...@gmail.com>
Authored: Thu Feb 8 17:23:09 2018 -0800
Committer: Vinod Kone <vi...@gmail.com>
Committed: Thu Feb 8 17:23:58 2018 -0800
----------------------------------------------------------------------
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ae4f94a8/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index e126e86..7de3911 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ Release Notes - Mesos - Version 1.5.1 (WIP)
** Bug
* [MESOS-7742] - Race conditions in IOSwitchboard: listening on unix socket and premature closing of the connection.
* [MESOS-8411] - Killing a queued task can lead to the command executor never terminating.
+ * [MESOS-8552] - Failing `CGROUPS_ROOT_PidNamespaceForward` and `CGROUPS_ROOT_PidNamespaceBackward`
Release Notes - Mesos - Version 1.5.0