Skip to content

Widen flaky poll timeouts in maintenance, STT, and instance-op integration tests #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sjainit wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Widen flaky poll timeouts in maintenance, STT, and instance-op integration tests #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 52 additions & 14 deletions ...ore/src/test/java/org/apache/helix/integration/controller/TestClusterMaintenanceMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
Expand Down Expand Up @@ -204,7 +205,8 @@ public void testAutoExitMaintenanceMode() throws Exception {
for (int i = 0; i < 3; i++) {
_participants[i].syncStop();
}
TestHelper.verify(() -> _dataAccessor.getChildNames(_keyBuilder.liveInstances()).size() == 0, 2000L);
Assert.assertTrue(TestHelper.verify(
() -> _dataAccessor.getProperty(_keyBuilder.maintenance()) != null, TestHelper.WAIT_DURATION));

// Check that the cluster is in maintenance
MaintenanceSignal maintenanceSignal = _dataAccessor.getProperty(_keyBuilder.maintenance());
Expand All @@ -216,7 +218,8 @@ public void testAutoExitMaintenanceMode() throws Exception {
_participants[i] = new MockParticipantManager(ZK_ADDR, CLUSTER_NAME, instanceName);
_participants[i].syncStart();
}
TestHelper.verify(() -> _dataAccessor.getChildNames(_keyBuilder.liveInstances()).size() == 3, 2000L);
Assert.assertTrue(TestHelper.verify(
() -> _dataAccessor.getProperty(_keyBuilder.maintenance()) == null, TestHelper.WAIT_DURATION));

// Check that the cluster is no longer in maintenance (auto-recovered)
maintenanceSignal = _dataAccessor.getProperty(_keyBuilder.maintenance());
Expand All @@ -233,15 +236,24 @@ public void testNoAutoExitWhenManuallyPutInMaintenance() throws Exception {
for (int i = 0; i < 2; i++) {
_participants[i].syncStop();
}
TestHelper.verify(() -> _dataAccessor.getChildNames(_keyBuilder.liveInstances()).size() == 0, 2000L);
Assert.assertTrue(TestHelper.verify(() -> {
List<String> liveInstances = _dataAccessor.getChildNames(_keyBuilder.liveInstances());
return !liveInstances.contains(PARTICIPANT_PREFIX + "_" + _startPort)
&& !liveInstances.contains(PARTICIPANT_PREFIX + "_" + (_startPort + 1));
}, TestHelper.WAIT_DURATION));

// Now bring up all instances
for (int i = 0; i < 3; i++) {
String instanceName = PARTICIPANT_PREFIX + "_" + (_startPort + i);
_participants[i] = new MockParticipantManager(ZK_ADDR, CLUSTER_NAME, instanceName);
_participants[i].syncStart();
}
TestHelper.verify(() -> _dataAccessor.getChildNames(_keyBuilder.liveInstances()).size() == 3, 2000L);
Assert.assertTrue(TestHelper.verify(() -> {
List<String> liveInstances = _dataAccessor.getChildNames(_keyBuilder.liveInstances());
return liveInstances.contains(PARTICIPANT_PREFIX + "_" + _startPort)
&& liveInstances.contains(PARTICIPANT_PREFIX + "_" + (_startPort + 1))
&& liveInstances.contains(PARTICIPANT_PREFIX + "_" + (_startPort + 2));
}, TestHelper.WAIT_DURATION));

// The cluster should still be in maintenance because it was enabled manually
MaintenanceSignal maintenanceSignal = _dataAccessor.getProperty(_keyBuilder.maintenance());
Expand All @@ -262,7 +274,8 @@ public void testManualEnablingOverridesAutoEnabling() throws Exception {
for (int i = 0; i < 3; i++) {
_participants[i].syncStop();
}
TestHelper.verify(() -> _dataAccessor.getChildNames(_keyBuilder.liveInstances()).size() == 0, 2000L);
Assert.assertTrue(TestHelper.verify(
() -> _dataAccessor.getProperty(_keyBuilder.maintenance()) != null, TestHelper.WAIT_DURATION));

// Check that maintenance signal was triggered by Controller
MaintenanceSignal maintenanceSignal = _dataAccessor.getProperty(_keyBuilder.maintenance());
Expand All @@ -275,7 +288,11 @@ public void testManualEnablingOverridesAutoEnabling() throws Exception {
"TRIGGERED_BY", "SHOULD NOT BE RECORDED");
_gSetupTool.getClusterManagementTool().manuallyEnableMaintenanceMode(CLUSTER_NAME, true, null,
customFields);
TestHelper.verify(() -> _dataAccessor.getProperty(_keyBuilder.maintenance()) != null, 2000L);
Assert.assertTrue(TestHelper.verify(() -> {
MaintenanceSignal signal = _dataAccessor.getProperty(_keyBuilder.maintenance());
return signal != null
&& signal.getTriggeringEntity() == MaintenanceSignal.TriggeringEntity.USER;
}, TestHelper.WAIT_DURATION));

// Check that maintenance mode has successfully overwritten with the right TRIGGERED_BY field
maintenanceSignal = _dataAccessor.getProperty(_keyBuilder.maintenance());
Expand All @@ -301,7 +318,11 @@ public void testMaxPartitionLimit() throws Exception {
// Manually exit maintenance mode
_gSetupTool.getClusterManagementTool().manuallyEnableMaintenanceMode(CLUSTER_NAME, false, null,
null);
TestHelper.verify(() -> _dataAccessor.getProperty(_keyBuilder.maintenance()) != null, 2000L);
Assert.assertTrue(TestHelper.verify(() -> {
MaintenanceSignal signal = _dataAccessor.getProperty(_keyBuilder.maintenance());
return signal != null
&& signal.getTriggeringEntity() == MaintenanceSignal.TriggeringEntity.CONTROLLER;
}, TestHelper.WAIT_DURATION));

// Since 3 instances are missing, the cluster should have gone back under maintenance
// automatically
Expand All @@ -318,7 +339,8 @@ public void testMaxPartitionLimit() throws Exception {
_participants[i] = new MockParticipantManager(ZK_ADDR, CLUSTER_NAME, instanceName);
_participants[i].syncStart();
}
TestHelper.verify(() -> _dataAccessor.getChildNames(_keyBuilder.liveInstances()).size() == 3, 2000L);
Assert.assertTrue(TestHelper.verify(
() -> _dataAccessor.getProperty(_keyBuilder.maintenance()) == null, TestHelper.WAIT_DURATION));

// Check that the cluster exited maintenance
maintenanceSignal = _dataAccessor.getProperty(_keyBuilder.maintenance());
Expand All @@ -328,7 +350,8 @@ public void testMaxPartitionLimit() throws Exception {
for (int i = 0; i < 3; i++) {
_participants[i].syncStop();
}
TestHelper.verify(() -> _dataAccessor.getChildNames(_keyBuilder.liveInstances()).size() == 0, 2000L);
Assert.assertTrue(TestHelper.verify(
() -> _dataAccessor.getProperty(_keyBuilder.maintenance()) != null, TestHelper.WAIT_DURATION));

// Check that cluster is back under maintenance
maintenanceSignal = _dataAccessor.getProperty(_keyBuilder.maintenance());
Expand All @@ -344,9 +367,9 @@ public void testMaxPartitionLimit() throws Exception {
// automatically because the instances currently have more than 1
clusterConfig.setMaxPartitionsPerInstance(1);
_manager.getConfigAccessor().setClusterConfig(CLUSTER_NAME, clusterConfig);
TestHelper.verify(
Assert.assertTrue(TestHelper.verify(
() -> ((ClusterConfig) _dataAccessor.getProperty(_keyBuilder.clusterConfig())).getMaxPartitionsPerInstance() == 1,
2000L);
TestHelper.WAIT_DURATION));


// Now bring up all instances
Expand All @@ -355,7 +378,12 @@ public void testMaxPartitionLimit() throws Exception {
_participants[i] = new MockParticipantManager(ZK_ADDR, CLUSTER_NAME, instanceName);
_participants[i].syncStart();
}
TestHelper.verify(() -> _dataAccessor.getChildNames(_keyBuilder.liveInstances()).size() == 3, 2000L);
Assert.assertTrue(TestHelper.verify(() -> {
List<String> liveInstances = _dataAccessor.getChildNames(_keyBuilder.liveInstances());
return liveInstances.contains(PARTICIPANT_PREFIX + "_" + _startPort)
&& liveInstances.contains(PARTICIPANT_PREFIX + "_" + (_startPort + 1))
&& liveInstances.contains(PARTICIPANT_PREFIX + "_" + (_startPort + 2));
}, TestHelper.WAIT_DURATION));

// Check that the cluster is still in maintenance (should not have auto-exited because it would
// fail the MaxPartitionsPerInstance check)
Expand Down Expand Up @@ -432,7 +460,12 @@ public void testMaintenanceHistory() throws Exception {
clusterConfig.setMaxPartitionsPerInstance(-1);
_manager.getConfigAccessor().setClusterConfig(CLUSTER_NAME, clusterConfig);

TestHelper.verify(() -> _dataAccessor.getProperty(_keyBuilder.maintenance()) == null, 2000L);
Assert.assertTrue(TestHelper.verify(() -> {
ControllerHistory h = _dataAccessor.getProperty(_keyBuilder.controllerLeaderHistory());
return "EXIT".equals(convertStringToMap(
h.getMaintenanceHistoryList().get(h.getMaintenanceHistoryList().size() - 1))
.get("OPERATION_TYPE"));
}, TestHelper.WAIT_DURATION));

// Now check that the cluster exited maintenance
// EXIT, CONTROLLER, for MAX_PARTITION_PER_INSTANCE_EXCEEDED
Expand All @@ -448,7 +481,12 @@ public void testMaintenanceHistory() throws Exception {
Map<String, String> customFieldMap = ImmutableMap.of("k1", "v1", "k2", "v2");
_gSetupTool.getClusterManagementTool()
.manuallyEnableMaintenanceMode(CLUSTER_NAME, true, TestHelper.getTestMethodName(), customFieldMap);
TestHelper.verify(() -> _dataAccessor.getProperty(_keyBuilder.maintenance()) != null, 2000L);
Assert.assertTrue(TestHelper.verify(() -> {
ControllerHistory h = _dataAccessor.getProperty(_keyBuilder.controllerLeaderHistory());
Map<String, String> last = convertStringToMap(
h.getMaintenanceHistoryList().get(h.getMaintenanceHistoryList().size() - 1));
return "ENTER".equals(last.get("OPERATION_TYPE")) && "USER".equals(last.get("TRIGGERED_BY"));
}, TestHelper.WAIT_DURATION));

// ENTER, USER, for reason TEST, no internalReason
history = _dataAccessor.getProperty(_keyBuilder.controllerLeaderHistory());
Expand Down
7 changes: 4 additions & 3 deletions ...ore/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,13 @@ public void testStateTransitionTimeOut() throws Exception {

boolean result =
ClusterStateVerifier
.verifyByPolling(new MasterNbInExtViewVerifier(ZK_ADDR, CLUSTER_NAME));
.verifyByPolling(new MasterNbInExtViewVerifier(ZK_ADDR, CLUSTER_NAME),
TestHelper.WAIT_DURATION);
Assert.assertTrue(result);
HelixDataAccessor accessor = _participants[0].getHelixDataAccessor();

TestHelper.verify(() -> verify(accessor, idealState, factories), 5000);
Assert.assertTrue(verify(accessor, idealState, factories));
Assert.assertTrue(TestHelper.verify(
() -> verify(accessor, idealState, factories), TestHelper.WAIT_DURATION));
}

private boolean verify(HelixDataAccessor accessor, IdealState idealState,
Expand Down
10 changes: 5 additions & 5 deletions helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestInstanceOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,7 +1381,7 @@ public void testDisabledPartitionsBeforeSwapInitiated() throws Exception {
_gSetupTool.getClusterManagementTool().setInstanceConfig(CLUSTER_NAME, instanceToSwapInName, swapInInstanceConfig);

// Assert successfully complete swap
verifier(() -> _gSetupTool.getClusterManagementTool().canCompleteSwap(CLUSTER_NAME, instanceToSwapOutName), 30000);
verifier(() -> _gSetupTool.getClusterManagementTool().canCompleteSwap(CLUSTER_NAME, instanceToSwapOutName), TestHelper.WAIT_DURATION);
Assert.assertTrue(_gSetupTool.getClusterManagementTool()
.completeSwapIfPossible(CLUSTER_NAME, instanceToSwapOutName, false));
Assert.assertTrue(_clusterVerifier.verifyByPolling());
Expand Down Expand Up @@ -1492,7 +1492,7 @@ public void testEvacuateAndCancelBeforeBootstrapFinish() throws Exception {
continue;
}
verifier(() -> ((_dataAccessor.getChildNames(
_dataAccessor.keyBuilder().messages(participant))).isEmpty()), 30000);
_dataAccessor.keyBuilder().messages(participant))).isEmpty()), TestHelper.WAIT_DURATION);
}
Assert.assertFalse(_admin.isEvacuateFinished(CLUSTER_NAME, instanceToEvacuate));
Assert.assertFalse(_admin.isReadyForPreparingJoiningCluster(CLUSTER_NAME, instanceToEvacuate));
Expand Down Expand Up @@ -1545,7 +1545,7 @@ public void testEvacuateAndCancelBeforeDropFinish() throws Exception {

// message should be pending at the to evacuate participant
verifier(() -> ((_dataAccessor.getChildNames(
_dataAccessor.keyBuilder().messages(instanceToEvacuate))).isEmpty()), 30000);
_dataAccessor.keyBuilder().messages(instanceToEvacuate))).isEmpty()), TestHelper.WAIT_DURATION);
Assert.assertFalse(_admin.isEvacuateFinished(CLUSTER_NAME, instanceToEvacuate));

// cancel evacuation
Expand Down Expand Up @@ -1708,7 +1708,7 @@ public void testEvacuationWithOfflineInstancesInCluster() throws Exception {
}
}
return true;
}, 30000);
}, TestHelper.WAIT_DURATION);

removeOfflineOrInactiveInstances();
addParticipant(PARTICIPANT_PREFIX + "_" + _nextStartPort);
Expand Down Expand Up @@ -1767,7 +1767,7 @@ public void testEvacuateWithDisabledPartition() throws Exception {
_gSetupTool.getClusterManagementTool().setInstanceOperation(CLUSTER_NAME,
toDisableThenEvacuateInstanceName, InstanceConstants.InstanceOperation.EVACUATE);

verifier(() -> _admin.isEvacuateFinished(CLUSTER_NAME, toDisableThenEvacuateInstanceName), 30000);
verifier(() -> _admin.isEvacuateFinished(CLUSTER_NAME, toDisableThenEvacuateInstanceName), TestHelper.WAIT_DURATION);
int downwardSTCountAfterEvacuateComplete = stateTransitionCountStateModelFactory.getDownwardStateTransitionCounter();

// Assert node received no upward state transitions after evacuation was called on already disabled node
Expand Down
Loading