You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2013/12/03 20:42:57 UTC
[2/2] git commit: Fixed a flaky test:
FaultToleranceTest.ReregisterFrameworkExitedExecutor.
Fixed a flaky test: FaultToleranceTest.ReregisterFrameworkExitedExecutor.
Review: https://reviews.apache.org/r/15955
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4173ec93
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4173ec93
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4173ec93
Branch: refs/heads/master
Commit: 4173ec9358c7882eafdbf0dd8ef99173b3f05257
Parents: 853c606
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Mon Dec 2 17:33:55 2013 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Tue Dec 3 11:36:59 2013 -0800
----------------------------------------------------------------------
src/tests/fault_tolerance_tests.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/4173ec93/src/tests/fault_tolerance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp
index 27095cc..7157292 100644
--- a/src/tests/fault_tolerance_tests.cpp
+++ b/src/tests/fault_tolerance_tests.cpp
@@ -1175,17 +1175,18 @@ TEST_F(FaultToleranceTest, ReregisterFrameworkExitedExecutor)
// Wait for the slave to re-register.
AWAIT_READY(slaveReregisteredMessage);
- // Allow the executor exited message and drop the status update.
+ // Allow the executor exited message and drop the status update,
+ // it's possible for a duplicate update to occur if the status
+ // update manager is notified of the new master after the task was
+ // killed.
Future<ExitedExecutorMessage> executorExitedMessage =
FUTURE_PROTOBUF(ExitedExecutorMessage(), _, _);
- Future<StatusUpdateMessage> statusUpdateMessage =
- DROP_PROTOBUF(StatusUpdateMessage(), _, _);
+ DROP_PROTOBUFS(StatusUpdateMessage(), _, _);
// Now kill the executor.
dispatch(isolator, &Isolator::killExecutor, frameworkId, DEFAULT_EXECUTOR_ID);
AWAIT_READY(executorExitedMessage);
- AWAIT_READY(statusUpdateMessage);
// Now notify the framework of the new master.
Future<FrameworkRegisteredMessage> frameworkRegisteredMessage2 =