Repository: helix Updated Branches: refs/heads/master 70c9d76ad -> ef6e9bbe0
[HELIX-378] Add instance gauges to ClusterStatusMonitor, fix test failure Project: http://git-wip-us.apache.org/repos/asf/helix/repo Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/ef6e9bbe Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/ef6e9bbe Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/ef6e9bbe Branch: refs/heads/master Commit: ef6e9bbe0d624d810f02f6c74c01e57ed1d05787 Parents: 70c9d76 Author: Kanak Biscuitwala <[email protected]> Authored: Wed Feb 19 13:34:44 2014 -0800 Committer: Kanak Biscuitwala <[email protected]> Committed: Wed Feb 19 13:39:37 2014 -0800 ---------------------------------------------------------------------- .../TestClusterStatusMonitorLifecycle.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/helix/blob/ef6e9bbe/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java b/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java index e4fde8f..46af6c4 100644 --- a/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java +++ b/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java @@ -196,7 +196,7 @@ public class TestClusterStatusMonitorLifecycle extends ZkIntegrationTestBase { _participants[0].disconnect(); - // participant goes away. should be no change + // participant goes away. should be no change in number of beans as config is still present Thread.sleep(1000); Assert.assertTrue(nMbeansUnregistered == listener._nMbeansUnregistered); Assert.assertTrue(nMbeansRegistered == listener._nMbeansRegistered); @@ -214,9 +214,9 @@ public class TestClusterStatusMonitorLifecycle extends ZkIntegrationTestBase { firstController.disconnect(); Thread.sleep(1000); - // 1 cluster status monitor and 1 resource monitor - Assert.assertTrue(nMbeansUnregistered == listener._nMbeansUnregistered - 2); - Assert.assertTrue(nMbeansRegistered == listener._nMbeansRegistered - 2); + // 1 cluster status monitor, 1 resource monitor, 5 instances + Assert.assertTrue(nMbeansUnregistered == listener._nMbeansUnregistered - 7); + Assert.assertTrue(nMbeansRegistered == listener._nMbeansRegistered - 7); String instanceName = "localhost0_" + (12918 + 0); _participants[0] = new MockParticipantManager(ZK_ADDR, _firstClusterName, instanceName); @@ -224,8 +224,8 @@ public class TestClusterStatusMonitorLifecycle extends ZkIntegrationTestBase { // participant goes back. should be no change Thread.sleep(1000); - Assert.assertTrue(nMbeansUnregistered == listener._nMbeansUnregistered - 2); - Assert.assertTrue(nMbeansRegistered == listener._nMbeansRegistered - 2); + Assert.assertTrue(nMbeansUnregistered == listener._nMbeansUnregistered - 7); + Assert.assertTrue(nMbeansRegistered == listener._nMbeansRegistered - 7); // Add a resource, one more mbean registered ClusterSetup setupTool = new ClusterSetup(ZK_ADDR); @@ -237,14 +237,14 @@ public class TestClusterStatusMonitorLifecycle extends ZkIntegrationTestBase { Integer.parseInt(idealState.getReplicas())); Thread.sleep(1000); - Assert.assertTrue(nMbeansUnregistered == listener._nMbeansUnregistered - 2); - Assert.assertTrue(nMbeansRegistered == listener._nMbeansRegistered - 3); + Assert.assertTrue(nMbeansUnregistered == listener._nMbeansUnregistered - 7); + Assert.assertTrue(nMbeansRegistered == listener._nMbeansRegistered - 8); // remove resource, no change setupTool.dropResourceFromCluster(_firstClusterName, "TestDB1"); Thread.sleep(1000); - Assert.assertTrue(nMbeansUnregistered == listener._nMbeansUnregistered - 2); - Assert.assertTrue(nMbeansRegistered == listener._nMbeansRegistered - 3); + Assert.assertTrue(nMbeansUnregistered == listener._nMbeansUnregistered - 7); + Assert.assertTrue(nMbeansRegistered == listener._nMbeansRegistered - 8); } }
