Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,15 @@ public void testRegionAssignmentAfterMasterRecoveryDueToZKExpiry() throws Except
m.getZooKeeper().close();
MockLoadBalancer.retainAssignCalled = false;
final int expectedNumOfListeners = countPermanentListeners(zkw);
// the master could already been aborted by some background tasks but here we call abort
// directly to make sure this will happen
m.abort("Test recovery from zk session expired",
new KeeperException.SessionExpiredException());
assertTrue(m.isStopped()); // Master doesn't recover any more
// it is possible that our abort call above returned earlier because of someone else has
// already called abort, but it is possible that it has not finished the abort call yet so the
// isStopped flag is still false, let's wait for sometime.
TEST_UTIL.waitFor(5000, () -> m.isStopped()); // Master doesn't recover any more

// The recovered master should not call retainAssignment, as it is not a
// clean startup.
assertFalse("Retain assignment should not be called", MockLoadBalancer.retainAssignCalled);
Expand Down