This is an automated email from the ASF dual-hosted git repository.
xyuanlu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
The following commit(s) were added to refs/heads/master by this push:
new d8366de5f Fix BestPossibleVerifier attempting to verify all WAGED
resources(#2955)
d8366de5f is described below
commit d8366de5fe0d242e9ac86dc32d8cd378192d38b3
Author: Xiaxuan Gao <[email protected]>
AuthorDate: Fri Nov 22 20:19:06 2024 -0800
Fix BestPossibleVerifier attempting to verify all WAGED resources(#2955)
---
.../BestPossibleExternalViewVerifier.java | 6 ++-
.../apache/helix/tools/TestClusterVerifier.java | 57 ++++++++++++++++++++++
2 files changed, 62 insertions(+), 1 deletion(-)
diff --git
a/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/BestPossibleExternalViewVerifier.java
b/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/BestPossibleExternalViewVerifier.java
index cae5cb010..5c45ac6ac 100644
---
a/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/BestPossibleExternalViewVerifier.java
+++
b/helix-core/src/main/java/org/apache/helix/tools/ClusterVerifiers/BestPossibleExternalViewVerifier.java
@@ -27,7 +27,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -330,6 +329,11 @@ public class BestPossibleExternalViewVerifier extends
ZkHelixClusterVerifier {
}
}
+ // Process resources to retain only those requested
+ if (_resources != null && !_resources.isEmpty()) {
+ idealStates.keySet().retainAll(_resources);
+ extViews.keySet().retainAll(_resources);
+ }
for (String resourceName : idealStates.keySet()) {
IdealState is = idealStates.get(resourceName);
ExternalView extView = extViews.get(resourceName);
diff --git
a/helix-core/src/test/java/org/apache/helix/tools/TestClusterVerifier.java
b/helix-core/src/test/java/org/apache/helix/tools/TestClusterVerifier.java
index bbafe22ff..339ceb236 100644
--- a/helix-core/src/test/java/org/apache/helix/tools/TestClusterVerifier.java
+++ b/helix-core/src/test/java/org/apache/helix/tools/TestClusterVerifier.java
@@ -20,6 +20,7 @@ package org.apache.helix.tools;
*/
import java.util.Arrays;
+import java.util.Collections;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -263,4 +264,60 @@ public class TestClusterVerifier extends ZkUnitTestBase {
// The new participant causes rebalance, but the state transitions are all
stuck
Assert.assertFalse(strictMatchVerifier.verify(3000));
}
+
+ @Test
+ public void testExternalViewBestPossibleVerifierWorkWithWaged() throws
InterruptedException {
+ // Create a WAGED resource with 2 replicas and verify that it is balanced
+ String testDB1 = "resource-wagedDB1";
+ _setupTool.addResourceToCluster(_clusterName, testDB1, 1,
+ BuiltInStateModelDefinitions.MasterSlave.name(),
RebalanceMode.FULL_AUTO.toString());
+ _admin.enableWagedRebalance(_clusterName,
Collections.singletonList(testDB1));
+ IdealState db1IdealState = _admin.getResourceIdealState(_clusterName,
testDB1);
+ db1IdealState.setReplicas(Integer.toString(2));
+ db1IdealState.getRecord().setListField(testDB1 + "_0",
+ Arrays.asList(_participants[0].getInstanceName(),
_participants[1].getInstanceName()));
+ _admin.setResourceIdealState(_clusterName, testDB1, db1IdealState);
+
+ // Verify that the resource is balanced
+ BestPossibleExternalViewVerifier bestPossibleVerifier =
+ new
BestPossibleExternalViewVerifier.Builder(_clusterName).setZkClient(_gZkClient)
+ .setResources(Sets.newHashSet(testDB1))
+
.setWaitTillVerify(TestHelper.DEFAULT_REBALANCE_PROCESSING_WAIT_TIME)
+ .build();
+ Assert.assertTrue(bestPossibleVerifier.verify(10000));
+
+ // Re-start a new participant with sleeping transition(all state model
transition cannot finish)
+ // This should fail the verification of the second resource
+ _participants[2].syncStop();
+ Thread.sleep(1000);
+
+ _participants[2] = new MockParticipantManager(ZK_ADDR, _clusterName,
_participants[2].getInstanceName());
+ _participants[2].setTransition(new SleepTransition(99999999));
+ _participants[2].syncStart();
+
+ // Create the second WAGED resource with 2 replicas and verify that it is
NOT balanced
+ String testDB2 = "resource-wagedDB2";
+ _setupTool.addResourceToCluster(_clusterName, testDB2, 1,
+ BuiltInStateModelDefinitions.MasterSlave.name(),
RebalanceMode.FULL_AUTO.toString());
+ _admin.enableWagedRebalance(_clusterName,
Collections.singletonList(testDB2));
+ IdealState db2IdealState = _admin.getResourceIdealState(_clusterName,
testDB2);
+ db2IdealState.setReplicas(Integer.toString(2));
+ db2IdealState.getRecord().setListField(testDB2 + "_0",
+ Arrays.asList(_participants[1].getInstanceName(),
_participants[2].getInstanceName()));
+ _admin.setResourceIdealState(_clusterName, testDB2, db2IdealState);
+
+ // Verify that the resource is NOT balanced
+ bestPossibleVerifier = new
BestPossibleExternalViewVerifier.Builder(_clusterName).setZkClient(_gZkClient)
+ .setResources(Sets.newHashSet(testDB2))
+ .setWaitTillVerify(TestHelper.DEFAULT_REBALANCE_PROCESSING_WAIT_TIME)
+ .build();
+ Assert.assertFalse(bestPossibleVerifier.verify(3000));
+
+ // The verification of the first resource should still pass
+ bestPossibleVerifier = new
BestPossibleExternalViewVerifier.Builder(_clusterName).setZkClient(_gZkClient)
+ .setResources(Sets.newHashSet(testDB1))
+ .setWaitTillVerify(TestHelper.DEFAULT_REBALANCE_PROCESSING_WAIT_TIME)
+ .build();
+ Assert.assertTrue(bestPossibleVerifier.verify(10000));
+ }
}
