You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ne...@apache.org on 2017/07/05 22:50:58 UTC
mesos git commit: Fixed flaky
PersistentVolumeEndpointsTest.ReserveAndSlaveRemoval.
Repository: mesos
Updated Branches:
refs/heads/master b153cb95d -> 08f6b428f
Fixed flaky PersistentVolumeEndpointsTest.ReserveAndSlaveRemoval.
Review: https://reviews.apache.org/r/60485/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/08f6b428
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/08f6b428
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/08f6b428
Branch: refs/heads/master
Commit: 08f6b428fa9d74c8dfdb1b28607704ac78f826f0
Parents: b153cb9
Author: Neil Conway <ne...@gmail.com>
Authored: Wed Jul 5 15:33:02 2017 -0700
Committer: Neil Conway <ne...@gmail.com>
Committed: Wed Jul 5 15:50:39 2017 -0700
----------------------------------------------------------------------
src/tests/persistent_volume_endpoints_tests.cpp | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/08f6b428/src/tests/persistent_volume_endpoints_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/persistent_volume_endpoints_tests.cpp b/src/tests/persistent_volume_endpoints_tests.cpp
index a66bde2..7a24bf4 100644
--- a/src/tests/persistent_volume_endpoints_tests.cpp
+++ b/src/tests/persistent_volume_endpoints_tests.cpp
@@ -1781,17 +1781,21 @@ TEST_F(PersistentVolumeEndpointsTest, ReserveAndSlaveRemoval)
Try<Owned<cluster::Master>> master = StartMaster();
ASSERT_SOME(master);
- Owned<MasterDetector> detector = master.get()->createDetector();
+ Clock::pause();
Future<SlaveRegisteredMessage> slave1RegisteredMessage =
FUTURE_PROTOBUF(SlaveRegisteredMessage(), master.get()->pid, _);
+ Owned<MasterDetector> detector = master.get()->createDetector();
slave::Flags slave1Flags = CreateSlaveFlags();
slave1Flags.resources = "cpus:4";
- Try<Owned<cluster::Slave>> slave1 = StartSlave(detector.get(), slave1Flags);
+ Try<Owned<cluster::Slave>> slave1 = StartSlave(detector.get(), slave1Flags);
ASSERT_SOME(slave1);
+
+ Clock::advance(slave1Flags.registration_backoff_factor);
AWAIT_READY(slave1RegisteredMessage);
+
const SlaveID& slaveId1 = slave1RegisteredMessage->slave_id();
Future<SlaveRegisteredMessage> slave2RegisteredMessage =
@@ -1800,10 +1804,13 @@ TEST_F(PersistentVolumeEndpointsTest, ReserveAndSlaveRemoval)
// Each slave needs its own flags to ensure work_dirs are unique.
slave::Flags slave2Flags = CreateSlaveFlags();
slave2Flags.resources = "cpus:3";
- Try<Owned<cluster::Slave>> slave2 = StartSlave(detector.get(), slave2Flags);
+ Try<Owned<cluster::Slave>> slave2 = StartSlave(detector.get(), slave2Flags);
ASSERT_SOME(slave2);
+
+ Clock::advance(slave2Flags.registration_backoff_factor);
AWAIT_READY(slave2RegisteredMessage);
+
const SlaveID& slaveId2 = slave2RegisteredMessage->slave_id();
FrameworkInfo frameworkInfo = createFrameworkInfo();