Repository: helix Updated Branches: refs/heads/master 5e4e26cc8 -> 4db61b56e
http://git-wip-us.apache.org/repos/asf/helix/blob/4db61b56/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerFailover.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerFailover.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerFailover.java index a3b2d53..53c961d 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerFailover.java +++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerFailover.java @@ -67,7 +67,7 @@ public class TestTaskRebalancerFailover extends TaskTestBase { accessor.getProperty(keyBuilder.externalView(WorkflowGenerator.DEFAULT_TGT_DB)); JobContext ctx = _driver.getJobContext(namespacedJob1); Set<String> failOverPartitions = Sets.newHashSet(); - for (int p = 0; p < _numParitions; p++) { + for (int p = 0; p < _numPartitions; p++) { String instanceName = ctx.getAssignedParticipant(p); Assert.assertNotNull(instanceName); String partitionName = ctx.getTargetForPartition(p); @@ -93,7 +93,7 @@ public class TestTaskRebalancerFailover extends TaskTestBase { // tasks previously assigned to localhost_12918 should be re-scheduled on new master ctx = _driver.getJobContext(namespacedJob2); ev = accessor.getProperty(keyBuilder.externalView(WorkflowGenerator.DEFAULT_TGT_DB)); - for (int p = 0; p < _numParitions; p++) { + for (int p = 0; p < _numPartitions; p++) { String partitionName = ctx.getTargetForPartition(p); Assert.assertNotNull(partitionName); if (failOverPartitions.contains(partitionName)) { @@ -121,4 +121,4 @@ public class TestTaskRebalancerFailover extends TaskTestBase { Assert.assertFalse(dag.getParentsToChildren().containsKey(namespacedJob1)); Assert.assertFalse(dag.getParentsToChildren().containsKey(namespacedJob2)); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/helix/blob/4db61b56/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerRetryLimit.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerRetryLimit.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerRetryLimit.java index 6ee502b..3705b56 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerRetryLimit.java +++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerRetryLimit.java @@ -53,7 +53,7 @@ public class TestTaskRebalancerRetryLimit extends TaskTestBase { _driver.pollForWorkflowState(jobResource, TaskState.COMPLETED); JobContext ctx = _driver.getJobContext(TaskUtil.getNamespacedJobName(jobResource)); - for (int i = 0; i < _numParitions; i++) { + for (int i = 0; i < _numPartitions; i++) { TaskPartitionState state = ctx.getPartitionState(i); if (state != null) { Assert.assertEquals(state, TaskPartitionState.TASK_ERROR); @@ -61,4 +61,4 @@ public class TestTaskRebalancerRetryLimit extends TaskTestBase { } } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/helix/blob/4db61b56/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRetryDelay.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRetryDelay.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRetryDelay.java index df8beed..a4aa904 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRetryDelay.java +++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRetryDelay.java @@ -32,7 +32,7 @@ public class TestTaskRetryDelay extends TaskTestBase { @BeforeClass public void beforeClass() throws Exception { - _numParitions = 1; + _numPartitions = 1; super.beforeClass(); } @@ -77,5 +77,4 @@ public class TestTaskRetryDelay extends TaskTestBase { // It should finished at less than 2 sec Assert.assertTrue(finishedTime - startTime <= 2000L); } -} - +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/helix/blob/4db61b56/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowJobDependency.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowJobDependency.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowJobDependency.java index 45558b6..d3e7eef 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowJobDependency.java +++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowJobDependency.java @@ -40,7 +40,7 @@ public class TestWorkflowJobDependency extends TaskTestBase { @BeforeClass public void beforeClass() throws Exception { _numDbs = 5; - _numParitions = 1; + _numPartitions = 1; _partitionVary = false; super.beforeClass(); } @@ -121,4 +121,4 @@ public class TestWorkflowJobDependency extends TaskTestBase { .getJobContext(TaskUtil.getNamespacedJobName(workflowName, "job" + _testDbs.get(1))); Assert.assertTrue(context2.getStartTime() - context1.getFinishTime() >= 0L); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/helix/blob/4db61b56/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTermination.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTermination.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTermination.java index 2da3e2f..231be06 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTermination.java +++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTermination.java @@ -32,7 +32,7 @@ public class TestWorkflowTermination extends TaskTestBase { public void beforeClass() throws Exception { _numDbs = 1; _numNodes = 3; - _numParitions = 5; + _numPartitions = 5; _numReplicas = 3; super.beforeClass(); } @@ -290,4 +290,4 @@ public class TestWorkflowTermination extends TaskTestBase { .format("%s:%s=%s, %s=%s", MonitorDomainNames.ClusterStatus.name(), "cluster", CLUSTER_NAME, "workflowType", WORKFLOW_TYPE)); } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/helix/blob/4db61b56/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTimeout.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTimeout.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTimeout.java index 18cfa6c..fb8cdd3 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTimeout.java +++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestWorkflowTimeout.java @@ -24,7 +24,7 @@ public class TestWorkflowTimeout extends TaskTestBase { public void beforeClass() throws Exception { _numDbs = 1; _numNodes = 3; - _numParitions = 5; + _numPartitions = 5; _numReplicas = 3; super.beforeClass(); http://git-wip-us.apache.org/repos/asf/helix/blob/4db61b56/helix-core/src/test/java/org/apache/helix/task/TaskSynchronizedTestBase.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/task/TaskSynchronizedTestBase.java b/helix-core/src/test/java/org/apache/helix/task/TaskSynchronizedTestBase.java index b4fe3fa..f06fef8 100644 --- a/helix-core/src/test/java/org/apache/helix/task/TaskSynchronizedTestBase.java +++ b/helix-core/src/test/java/org/apache/helix/task/TaskSynchronizedTestBase.java @@ -43,7 +43,7 @@ import org.testng.annotations.BeforeClass; public class TaskSynchronizedTestBase extends ZkTestBase { protected int _numNodes = 5; protected int _startPort = 12918; - protected int _numParitions = 20; + protected int _numPartitions = 20; protected int _numReplicas = 3; protected int _numDbs = 1; @@ -99,7 +99,7 @@ public class TaskSynchronizedTestBase extends ZkTestBase { int varyNum = _partitionVary == true ? 10 * i : 0; String db = WorkflowGenerator.DEFAULT_TGT_DB + i; clusterSetup - .addResourceToCluster(CLUSTER_NAME, db, _numParitions + varyNum, MASTER_SLAVE_STATE_MODEL, + .addResourceToCluster(CLUSTER_NAME, db, _numPartitions + varyNum, MASTER_SLAVE_STATE_MODEL, IdealState.RebalanceMode.FULL_AUTO.toString()); clusterSetup.rebalanceStorageCluster(CLUSTER_NAME, db, _numReplicas); _testDbs.add(db); @@ -107,14 +107,13 @@ public class TaskSynchronizedTestBase extends ZkTestBase { } else { if (_instanceGroupTag) { clusterSetup - .addResourceToCluster(CLUSTER_NAME, WorkflowGenerator.DEFAULT_TGT_DB, _numParitions, + .addResourceToCluster(CLUSTER_NAME, WorkflowGenerator.DEFAULT_TGT_DB, _numPartitions, "OnlineOffline", IdealState.RebalanceMode.FULL_AUTO.name()); IdealState idealState = clusterSetup.getClusterManagementTool().getResourceIdealState(CLUSTER_NAME, WorkflowGenerator.DEFAULT_TGT_DB); idealState.setInstanceGroupTag("TESTTAG0"); clusterSetup.getClusterManagementTool().setResourceIdealState(CLUSTER_NAME, WorkflowGenerator.DEFAULT_TGT_DB, idealState); } else { - clusterSetup.addResourceToCluster(CLUSTER_NAME, WorkflowGenerator.DEFAULT_TGT_DB, - _numParitions, MASTER_SLAVE_STATE_MODEL, IdealState.RebalanceMode.FULL_AUTO.name()); + clusterSetup.addResourceToCluster(CLUSTER_NAME, WorkflowGenerator.DEFAULT_TGT_DB, _numPartitions, MASTER_SLAVE_STATE_MODEL, IdealState.RebalanceMode.FULL_AUTO.name()); } clusterSetup.rebalanceStorageCluster(CLUSTER_NAME, WorkflowGenerator.DEFAULT_TGT_DB, _numReplicas); } @@ -208,7 +207,7 @@ public class TaskSynchronizedTestBase extends ZkTestBase { public void setSingleTestEnvironment() { _numDbs = 1; _numNodes = 1; - _numParitions = 1; + _numPartitions = 1; _numReplicas = 1; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/helix/blob/4db61b56/helix-core/src/test/java/org/apache/helix/task/TestSemiAutoStateTransition.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/task/TestSemiAutoStateTransition.java b/helix-core/src/test/java/org/apache/helix/task/TestSemiAutoStateTransition.java index a281863..7cda09a 100644 --- a/helix-core/src/test/java/org/apache/helix/task/TestSemiAutoStateTransition.java +++ b/helix-core/src/test/java/org/apache/helix/task/TestSemiAutoStateTransition.java @@ -43,7 +43,7 @@ public class TestSemiAutoStateTransition extends TaskTestBase { @BeforeClass public void beforeClass() throws Exception { _participants = new MockParticipantManager[_numNodes]; - _numParitions = 1; + _numPartitions = 1; _gSetupTool.addCluster(CLUSTER_NAME, true); _accessor = new ZKHelixDataAccessor(CLUSTER_NAME, _baseAccessor); @@ -52,7 +52,7 @@ public class TestSemiAutoStateTransition extends TaskTestBase { for (int i = 0; i < _numDbs; i++) { String db = WorkflowGenerator.DEFAULT_TGT_DB + i; - _gSetupTool.addResourceToCluster(CLUSTER_NAME, db, _numParitions, MASTER_SLAVE_STATE_MODEL, + _gSetupTool.addResourceToCluster(CLUSTER_NAME, db, _numPartitions, MASTER_SLAVE_STATE_MODEL, IdealState.RebalanceMode.SEMI_AUTO.toString()); _gSetupTool.rebalanceStorageCluster(CLUSTER_NAME, db, _numReplicas); _testDbs.add(db); @@ -98,4 +98,4 @@ public class TestSemiAutoStateTransition extends TaskTestBase { Assert.assertEquals("MASTER", stateMap.get(PARTICIPANT_PREFIX + "_" + (_startPort + 1))); Assert.assertEquals("SLAVE", stateMap.get(PARTICIPANT_PREFIX + "_" + (_startPort + 2))); } -} +} \ No newline at end of file
