[mesos] 02/02: Added a test to ensure that filters are cleared upon unsuppression.

[bm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bmahler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git

commit 11a7e71532a7c9b3a1032a178e3d7562577575a6
Author: Benjamin Mahler <bm...@apache.org>
AuthorDate: Fri Aug 9 17:33:23 2019 -0400

    Added a test to ensure that filters are cleared upon unsuppression.
    
    Review: https://reviews.apache.org/r/71265
---
 src/tests/master/update_framework_tests.cpp | 77 +++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/src/tests/master/update_framework_tests.cpp b/src/tests/master/update_framework_tests.cpp
index 79aac41..514647d 100644
--- a/src/tests/master/update_framework_tests.cpp
+++ b/src/tests/master/update_framework_tests.cpp
@@ -1135,6 +1135,83 @@ TEST_F(UpdateFrameworkV0Test, SuppressedRoles)
 }
 
 
+// Test that when a framework removes a role from the
+// suppressed roles, it clears filters (same as REVIVE):
+// - start a master, a driver and an agent
+// - wait for offer and decline it for a long timeout
+// - add / remove suppressed roles via updateFramework
+// - ensure we get an offer for the agent again
+TEST_F(UpdateFrameworkV0Test, UnsuppressClearsFilters)
+{
+  mesos::internal::master::Flags masterFlags = CreateMasterFlags();
+  Try<Owned<cluster::Master>> master = StartMaster(masterFlags);
+  ASSERT_SOME(master);
+
+  v1::MockMasterAPISubscriber masterAPISubscriber;
+  AWAIT_READY(masterAPISubscriber.subscribe(master.get()->pid));
+
+  Future<v1::master::Event::FrameworkUpdated> frameworkUpdated1;
+  Future<v1::master::Event::FrameworkUpdated> frameworkUpdated2;
+  EXPECT_CALL(masterAPISubscriber, frameworkUpdated(_))
+    .WillOnce(FutureArg<0>(&frameworkUpdated1))
+    .WillOnce(FutureArg<0>(&frameworkUpdated2));
+
+  Owned<MasterDetector> detector = master->get()->createDetector();
+
+  Try<Owned<cluster::Slave>> slave = StartSlave(detector.get());
+  ASSERT_SOME(slave);
+
+  MockScheduler sched;
+  TestingMesosSchedulerDriver driver(
+      &sched, detector.get(), DEFAULT_FRAMEWORK_INFO);
+
+  Future<FrameworkID> frameworkId;
+  EXPECT_CALL(sched, registered(&driver, _, _))
+    .WillOnce(FutureArg<1>(&frameworkId));
+
+  Future<vector<Offer>> offers1;
+  Future<vector<Offer>> offers2;
+  EXPECT_CALL(sched, resourceOffers(&driver, _))
+    .WillOnce(FutureArg<1>(&offers1))
+    .WillOnce(FutureArg<1>(&offers2));
+
+  driver.start();
+
+  AWAIT_READY(frameworkId);
+
+  AWAIT_READY(offers1);
+  ASSERT_EQ(1u, offers1->size());
+
+  Filters filters;
+  filters.set_refuse_seconds(Days(1).secs());
+
+  driver.declineOffer(offers1->at(0).id(), filters);
+
+  // Suppress and unsuppress the role.
+  FrameworkInfo update = DEFAULT_FRAMEWORK_INFO;
+  *update.mutable_id() = frameworkId.get();
+
+  vector<string> suppressedRoles(
+    update.roles().begin(), update.roles().end());
+
+  driver.updateFramework(update, suppressedRoles);
+  AWAIT_READY(frameworkUpdated1);
+
+  driver.updateFramework(update, {});
+  AWAIT_READY(frameworkUpdated2);
+
+  // Now the previously declined agent should be re-offered.
+  Clock::pause();
+  Clock::settle();
+  Clock::advance(masterFlags.allocation_interval);
+
+  AWAIT_READY(offers2);
+
+  driver.stop();
+  driver.join();
+}
+
+
 } // namespace tests {
 } // namespace internal {
 } // namespace mesos {