Skip to content
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

Jump to bottom

Fix TestClusterAggregateMetrics #1842

Merged
merged 1 commit into from
Sep 21, 2021
Merged

Fix TestClusterAggregateMetrics #1842

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
42 changes: 22 additions & 20 deletions helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestClusterAggregateMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,17 +151,22 @@ public void testAggregateMetrics() throws Exception {
.build();

// Everything should be up and running initially with 5 total partitions
updateMetrics();
Assert.assertEquals(_beanValueMap.get(PARTITION_COUNT), 5L);
Assert.assertEquals(_beanValueMap.get(ERROR_PARTITION_COUNT), 0L);
Assert.assertEquals(_beanValueMap.get(WITHOUT_TOPSTATE_COUNT), 0L);
Assert.assertEquals(_beanValueMap.get(IS_EV_MISMATCH_COUNT), 0L);
Map<String, Long> expectedMetricValues = new HashMap<>();
expectedMetricValues.put(PARTITION_COUNT, 5L);
expectedMetricValues.put(ERROR_PARTITION_COUNT, 0L);
expectedMetricValues.put(WITHOUT_TOPSTATE_COUNT, 0L);
expectedMetricValues.put(IS_EV_MISMATCH_COUNT, 0L);
Assert.assertTrue(verifyMetrics(expectedMetricValues));

// Disable all Participants (instances)
_setupTool.getClusterManagementTool()
.manuallyEnableMaintenanceMode(CLUSTER_NAME, true, "Test", null);
for (int i = 0; i < NUM_PARTICIPANTS; i++) {
String instanceName = PARTICIPANT_PREFIX + "_" + (START_PORT + i);
_setupTool.getClusterManagementTool().enableInstance(CLUSTER_NAME, instanceName, false);
}
_setupTool.getClusterManagementTool()
.manuallyEnableMaintenanceMode(CLUSTER_NAME, false, "Test", null);
// Confirm that the Participants have been disabled
boolean result = TestHelper.verify(() -> {
for (int i = 0; i < NUM_PARTICIPANTS; i++) {
Expand All @@ -177,11 +182,8 @@ public void testAggregateMetrics() throws Exception {
Assert.assertTrue(result);
Assert.assertTrue(verifier.verifyByPolling());

updateMetrics();
Assert.assertEquals(_beanValueMap.get(PARTITION_COUNT), 5L);
Assert.assertEquals(_beanValueMap.get(ERROR_PARTITION_COUNT), 0L);
Assert.assertEquals(_beanValueMap.get(WITHOUT_TOPSTATE_COUNT), 5L);
Assert.assertEquals(_beanValueMap.get(IS_EV_MISMATCH_COUNT), 0L);
expectedMetricValues.put(WITHOUT_TOPSTATE_COUNT, 5L);
Assert.assertTrue(verifyMetrics(expectedMetricValues));

// Re-enable all Participants (instances)
for (int i = 0; i < NUM_PARTICIPANTS; i++) {
Expand All @@ -203,11 +205,8 @@ public void testAggregateMetrics() throws Exception {
Assert.assertTrue(result);
Assert.assertTrue(verifier.verifyByPolling());

updateMetrics();
Assert.assertEquals(_beanValueMap.get(PARTITION_COUNT), 5L);
Assert.assertEquals(_beanValueMap.get(ERROR_PARTITION_COUNT), 0L);
Assert.assertEquals(_beanValueMap.get(WITHOUT_TOPSTATE_COUNT), 0L);
Assert.assertEquals(_beanValueMap.get(IS_EV_MISMATCH_COUNT), 0L);
expectedMetricValues.put(WITHOUT_TOPSTATE_COUNT, 0L);
Assert.assertTrue(verifyMetrics(expectedMetricValues));

// Drop the resource and check that all metrics are zero.
_setupTool.dropResourceFromCluster(CLUSTER_NAME, TEST_DB);
Expand All @@ -219,11 +218,8 @@ public void testAggregateMetrics() throws Exception {
Assert.assertTrue(result);
Assert.assertTrue(verifier.verifyByPolling());

updateMetrics();
Assert.assertEquals(_beanValueMap.get(PARTITION_COUNT), 0L);
Assert.assertEquals(_beanValueMap.get(ERROR_PARTITION_COUNT), 0L);
Assert.assertEquals(_beanValueMap.get(WITHOUT_TOPSTATE_COUNT), 0L);
Assert.assertEquals(_beanValueMap.get(IS_EV_MISMATCH_COUNT), 0L);
expectedMetricValues.put(PARTITION_COUNT, 0L);
Assert.assertTrue(verifyMetrics(expectedMetricValues));
}

/**
Expand All @@ -250,4 +246,10 @@ private void updateMetrics() {
// update failed
}
}

private boolean verifyMetrics(Map<String, Long> expectedValues) {
updateMetrics();
return expectedValues.entrySet().stream()
.allMatch(entry -> _beanValueMap.get(entry.getKey()).equals(entry.getValue()));
}
}