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 2013/08/22 19:55:58 UTC
[1/3] git commit: Fixed slave to not log a warning when it generates
TASK_LOST update.
Updated Branches:
refs/heads/master 212fbb268 -> 82fa5bff4
Fixed slave to not log a warning when it generates TASK_LOST update.
Review: https://reviews.apache.org/r/13715
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9aaad1da
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9aaad1da
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9aaad1da
Branch: refs/heads/master
Commit: 9aaad1da3e491dff5d6e8c13e28fa23ea78ed86a
Parents: 514f040
Author: Vinod Kone <vi...@twitter.com>
Authored: Wed Aug 21 14:04:26 2013 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Wed Aug 21 21:44:23 2013 -0700
----------------------------------------------------------------------
src/slave/slave.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9aaad1da/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 92a0a7e..563a099 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -1824,7 +1824,7 @@ void Slave::statusUpdate(const StatusUpdate& update, const UPID& pid)
// TODO(vinod): Revisit these semantics when we disallow executors
// from sending updates for tasks that belong to other executors.
- if (executor->pid != pid) {
+ if (pid != UPID() && executor->pid != pid) {
LOG(WARNING) << "Received status update " << update << " from " << pid
<< " on behalf of a different executor " << executor->id
<< " (" << executor->pid << ")";
[3/3] git commit: Fixed SlaveRecovery.Partitioned slave test.
Posted by vi...@apache.org.
Fixed SlaveRecovery.Partitioned slave test.
Review: https://reviews.apache.org/r/13729
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/82fa5bff
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/82fa5bff
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/82fa5bff
Branch: refs/heads/master
Commit: 82fa5bff4126b48d83dad5c96cfccb7fd634670d
Parents: 9aaad1d
Author: Vinod Kone <vi...@twitter.com>
Authored: Wed Aug 21 23:14:35 2013 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Wed Aug 21 23:15:29 2013 -0700
----------------------------------------------------------------------
src/tests/slave_recovery_tests.cpp | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/82fa5bff/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 830af59..548e8c0 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -1909,6 +1909,9 @@ TYPED_TEST(SlaveRecoveryTest, PartitionedSlave)
EXPECT_CALL(sched, statusUpdate(&driver, _))
.WillOnce(FutureArg<1>(&status));
+ Future<Nothing> executorTerminated =
+ FUTURE_DISPATCH(_, &Slave::executorTerminated);
+
Clock::pause();
// Now, induce a partition of the slave by having the master
@@ -1938,6 +1941,15 @@ TYPED_TEST(SlaveRecoveryTest, PartitionedSlave)
// Wait for the master to attempt to shut down the slave.
AWAIT_READY(shutdownMessage);
+ // Wait for the executor to be terminated.
+ while (executorTerminated.isPending()) {
+ Clock::advance(Seconds(1));
+ Clock::settle();
+ }
+
+ AWAIT_READY(executorTerminated);
+ Clock::settle();
+
this->Stop(slave.get());
Future<RegisterSlaveMessage> registerSlaveMessage =
[2/3] git commit: Fixed slave recovery tests to use 'strict' option
by default.
Posted by vi...@apache.org.
Fixed slave recovery tests to use 'strict' option by default.
Review: https://reviews.apache.org/r/13676
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/514f0406
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/514f0406
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/514f0406
Branch: refs/heads/master
Commit: 514f04063010c2eefd0a0b804259aca645754a5c
Parents: 212fbb2
Author: Vinod Kone <vi...@twitter.com>
Authored: Mon Aug 19 17:14:15 2013 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Wed Aug 21 21:44:23 2013 -0700
----------------------------------------------------------------------
src/tests/slave_recovery_tests.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/514f0406/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 3147860..830af59 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -128,7 +128,7 @@ public:
// Setup recovery slave flags.
flags.checkpoint = true;
flags.recover = "reconnect";
- flags.strict = false;
+ flags.strict = true;
return flags;
}
@@ -1190,8 +1190,9 @@ TYPED_TEST(SlaveRecoveryTest, KillTask)
// When the slave is down we remove the "latest" symlink in the
-// executor's run directory, to simulate a situation where the slave
-// cannot recover the executor and hence schedules it for gc.
+// executor's run directory, to simulate a situation where the
+// recovered slave (--no-strict) cannot recover the executor and
+// hence schedules it for gc.
TYPED_TEST(SlaveRecoveryTest, GCExecutor)
{
Try<PID<Master> > master = this->StartMaster();
@@ -1200,6 +1201,7 @@ TYPED_TEST(SlaveRecoveryTest, GCExecutor)
TypeParam isolator1;
slave::Flags flags = this->CreateSlaveFlags();
+ flags.strict = false;
Try<PID<Slave> > slave = this->StartSlave(&isolator1, flags);
ASSERT_SOME(slave);