mesos git commit: Fixed flakiness in 'ResourceProviderRegistrarTest.AgentRegistrar'.

[al...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 281d4693d -> 982aba2e9


Fixed flakiness in 'ResourceProviderRegistrarTest.AgentRegistrar'.

This test created an agent registrar which attempted to store its state
in the agent's meta directory before the agent had set up that
directory hierarchy.

This patch adds additional waiting to make sure required directories
have been set up before starting the agent registrar.

Review: https://reviews.apache.org/r/63024/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/982aba2e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/982aba2e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/982aba2e

Branch: refs/heads/master
Commit: 982aba2e92cca3a96fd2838ea5a45b56e9d21277
Parents: 281d469
Author: Benjamin Bannier <bb...@apache.org>
Authored: Mon Oct 16 17:44:47 2017 -0700
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Mon Oct 16 17:44:47 2017 -0700

----------------------------------------------------------------------
 src/tests/resource_provider_manager_tests.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/982aba2e/src/tests/resource_provider_manager_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/resource_provider_manager_tests.cpp b/src/tests/resource_provider_manager_tests.cpp
index 70d5217..ca49e1f 100644
--- a/src/tests/resource_provider_manager_tests.cpp
+++ b/src/tests/resource_provider_manager_tests.cpp
@@ -369,11 +369,19 @@ TEST_F(ResourceProviderRegistrarTest, AgentRegistrar)
   Future<SlaveRegisteredMessage> slaveRegisteredMessage =
     FUTURE_PROTOBUF(SlaveRegisteredMessage(), master.get()->pid, _);
 
+  Future<UpdateSlaveMessage> updateSlaveMessage =
+    FUTURE_PROTOBUF(UpdateSlaveMessage(), _, _);
+
   Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), flags);
   ASSERT_SOME(slave);
 
   AWAIT_READY(slaveRegisteredMessage);
 
+  // The agent will send `UpdateSlaveMessage` after it has created its
+  // meta directories. Await the message to make sure the agent
+  // registrar can create its store in the meta hierarchy.
+  AWAIT_READY(updateSlaveMessage);
+
   Try<Owned<Registrar>> registrar =
     Registrar::create(flags, slaveRegisteredMessage->slave_id());