You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2014/08/07 22:53:19 UTC
[1/2] git commit: [HELIX-422] Simplify single job creation
Repository: helix
Updated Branches:
refs/heads/master d35e29ad0 -> 8487c71a8
[HELIX-422] Simplify single job creation
This both augments the Java API to specify fully-built job configs, as
well as reduces the confusion between the job configs and the command
config maps they contain.
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/edfc98ed
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/edfc98ed
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/edfc98ed
Branch: refs/heads/master
Commit: edfc98edc07f3f732180e74f6c7983bee2192392
Parents: 8ba16a8
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Tue Aug 5 13:16:07 2014 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Thu Aug 7 13:51:35 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/helix/task/JobConfig.java | 26 ++++++++++----------
.../java/org/apache/helix/task/TaskUtil.java | 4 +--
.../java/org/apache/helix/task/Workflow.java | 11 +++++----
.../task/TestIndependentTaskRebalancer.java | 10 ++++----
.../integration/task/TestTaskRebalancer.java | 2 +-
.../task/TestTaskRebalancerStopResume.java | 2 +-
.../integration/task/WorkflowGenerator.java | 6 ++---
.../helix/provisioning/yarn/example/MyTask.java | 2 +-
8 files changed, 32 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/edfc98ed/helix-core/src/main/java/org/apache/helix/task/JobConfig.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/task/JobConfig.java b/helix-core/src/main/java/org/apache/helix/task/JobConfig.java
index 3f9ab41..1dad5e4 100644
--- a/helix-core/src/main/java/org/apache/helix/task/JobConfig.java
+++ b/helix-core/src/main/java/org/apache/helix/task/JobConfig.java
@@ -56,7 +56,7 @@ public class JobConfig {
/** The command that is to be run by participants in the case of identical tasks. */
public static final String COMMAND = "Command";
/** The command configuration to be used by the tasks. */
- public static final String JOB_CONFIG_MAP = "JobConfig";
+ public static final String JOB_COMMAND_CONFIG_MAP = "JobCommandConfig";
/** The timeout for a task. */
public static final String TIMEOUT_PER_TASK = "TimeoutPerPartition";
/** The maximum number of times the task rebalancer may attempt to execute a task. */
@@ -84,7 +84,7 @@ public class JobConfig {
private final List<String> _targetPartitions;
private final Set<String> _targetPartitionStates;
private final String _command;
- private final Map<String, String> _jobConfigMap;
+ private final Map<String, String> _jobCommandConfigMap;
private final long _timeoutPerTask;
private final int _numConcurrentTasksPerInstance;
private final int _maxAttemptsPerTask;
@@ -93,7 +93,7 @@ public class JobConfig {
private final Map<String, TaskConfig> _taskConfigMap;
private JobConfig(String workflow, String targetResource, List<String> targetPartitions,
- Set<String> targetPartitionStates, String command, Map<String, String> jobConfigMap,
+ Set<String> targetPartitionStates, String command, Map<String, String> jobCommandConfigMap,
long timeoutPerTask, int numConcurrentTasksPerInstance, int maxAttemptsPerTask,
int maxForcedReassignmentsPerTask, int failureThreshold, Map<String, TaskConfig> taskConfigMap) {
_workflow = workflow;
@@ -101,7 +101,7 @@ public class JobConfig {
_targetPartitions = targetPartitions;
_targetPartitionStates = targetPartitionStates;
_command = command;
- _jobConfigMap = jobConfigMap;
+ _jobCommandConfigMap = jobCommandConfigMap;
_timeoutPerTask = timeoutPerTask;
_numConcurrentTasksPerInstance = numConcurrentTasksPerInstance;
_maxAttemptsPerTask = maxAttemptsPerTask;
@@ -134,8 +134,8 @@ public class JobConfig {
return _command;
}
- public Map<String, String> getJobConfigMap() {
- return _jobConfigMap;
+ public Map<String, String> getJobCommandConfigMap() {
+ return _jobCommandConfigMap;
}
public long getTimeoutPerTask() {
@@ -172,10 +172,10 @@ public class JobConfig {
if (_command != null) {
cfgMap.put(JobConfig.COMMAND, _command);
}
- if (_jobConfigMap != null) {
- String serializedConfig = TaskUtil.serializeJobConfigMap(_jobConfigMap);
+ if (_jobCommandConfigMap != null) {
+ String serializedConfig = TaskUtil.serializeJobCommandConfigMap(_jobCommandConfigMap);
if (serializedConfig != null) {
- cfgMap.put(JobConfig.JOB_CONFIG_MAP, serializedConfig);
+ cfgMap.put(JobConfig.JOB_COMMAND_CONFIG_MAP, serializedConfig);
}
}
if (_targetResource != null) {
@@ -242,10 +242,10 @@ public class JobConfig {
if (cfg.containsKey(COMMAND)) {
b.setCommand(cfg.get(COMMAND));
}
- if (cfg.containsKey(JOB_CONFIG_MAP)) {
+ if (cfg.containsKey(JOB_COMMAND_CONFIG_MAP)) {
Map<String, String> commandConfigMap =
- TaskUtil.deserializeJobConfigMap(cfg.get(JOB_CONFIG_MAP));
- b.setJobConfigMap(commandConfigMap);
+ TaskUtil.deserializeJobCommandConfigMap(cfg.get(JOB_COMMAND_CONFIG_MAP));
+ b.setJobCommandConfigMap(commandConfigMap);
}
if (cfg.containsKey(TIMEOUT_PER_TASK)) {
b.setTimeoutPerTask(Long.parseLong(cfg.get(TIMEOUT_PER_TASK)));
@@ -292,7 +292,7 @@ public class JobConfig {
return this;
}
- public Builder setJobConfigMap(Map<String, String> v) {
+ public Builder setJobCommandConfigMap(Map<String, String> v) {
_commandConfig = v;
return this;
}
http://git-wip-us.apache.org/repos/asf/helix/blob/edfc98ed/helix-core/src/main/java/org/apache/helix/task/TaskUtil.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/task/TaskUtil.java b/helix-core/src/main/java/org/apache/helix/task/TaskUtil.java
index b8582b1..17b610d 100644
--- a/helix-core/src/main/java/org/apache/helix/task/TaskUtil.java
+++ b/helix-core/src/main/java/org/apache/helix/task/TaskUtil.java
@@ -260,7 +260,7 @@ public class TaskUtil {
* @param commandConfig map of job config key to config value
* @return serialized string
*/
- public static String serializeJobConfigMap(Map<String, String> commandConfig) {
+ public static String serializeJobCommandConfigMap(Map<String, String> commandConfig) {
ObjectMapper mapper = new ObjectMapper();
try {
String serializedMap = mapper.writeValueAsString(commandConfig);
@@ -276,7 +276,7 @@ public class TaskUtil {
* @param commandConfig the serialized job config map
* @return a map of job config key to config value
*/
- public static Map<String, String> deserializeJobConfigMap(String commandConfig) {
+ public static Map<String, String> deserializeJobCommandConfigMap(String commandConfig) {
ObjectMapper mapper = new ObjectMapper();
try {
Map<String, String> commandConfigMap =
http://git-wip-us.apache.org/repos/asf/helix/blob/edfc98ed/helix-core/src/main/java/org/apache/helix/task/Workflow.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/task/Workflow.java b/helix-core/src/main/java/org/apache/helix/task/Workflow.java
index 320c020..a8a2e12 100644
--- a/helix-core/src/main/java/org/apache/helix/task/Workflow.java
+++ b/helix-core/src/main/java/org/apache/helix/task/Workflow.java
@@ -188,7 +188,7 @@ public class Workflow {
builder.addConfig(job.name, JobConfig.WORKFLOW_ID, wf.name);
builder.addConfig(job.name, JobConfig.COMMAND, job.command);
if (job.jobConfigMap != null) {
- builder.addJobConfigMap(job.name, job.jobConfigMap);
+ builder.addJobCommandConfigMap(job.name, job.jobConfigMap);
}
builder.addConfig(job.name, JobConfig.TARGET_RESOURCE, job.targetResource);
if (job.targetPartitionStates != null) {
@@ -281,17 +281,18 @@ public class Workflow {
return this;
}
- public Builder addJobConfigMap(String job, Map<String, String> jobConfigMap) {
- return addConfig(job, JobConfig.JOB_CONFIG_MAP, TaskUtil.serializeJobConfigMap(jobConfigMap));
+ public Builder addJobCommandConfigMap(String job, Map<String, String> jobConfigMap) {
+ return addConfig(job, JobConfig.JOB_COMMAND_CONFIG_MAP,
+ TaskUtil.serializeJobCommandConfigMap(jobConfigMap));
}
- public Builder addJobConfig(String job, JobConfig jobConfig) {
+ public Builder addJobConfig(String job, JobConfig.Builder jobConfigBuilder) {
+ JobConfig jobConfig = jobConfigBuilder.setWorkflow(_name).build();
for (Map.Entry<String, String> e : jobConfig.getResourceConfigMap().entrySet()) {
String key = e.getKey();
String val = e.getValue();
addConfig(job, key, val);
}
- jobConfig.getJobConfigMap().put(JobConfig.WORKFLOW_ID, _name);
addTaskConfigs(job, jobConfig.getTaskConfigMap().values());
return this;
}
http://git-wip-us.apache.org/repos/asf/helix/blob/edfc98ed/helix-core/src/test/java/org/apache/helix/integration/task/TestIndependentTaskRebalancer.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestIndependentTaskRebalancer.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestIndependentTaskRebalancer.java
index 22beed1..9dda550 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestIndependentTaskRebalancer.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestIndependentTaskRebalancer.java
@@ -146,7 +146,7 @@ public class TestIndependentTaskRebalancer extends ZkTestBase {
workflowBuilder.addConfig(jobName, JobConfig.COMMAND, "DummyCommand");
Map<String, String> jobConfigMap = Maps.newHashMap();
jobConfigMap.put("Timeout", "1000");
- workflowBuilder.addJobConfigMap(jobName, jobConfigMap);
+ workflowBuilder.addJobCommandConfigMap(jobName, jobConfigMap);
_driver.start(workflowBuilder.build());
// Ensure the job completes
@@ -174,7 +174,7 @@ public class TestIndependentTaskRebalancer extends ZkTestBase {
workflowBuilder.addConfig(jobName, JobConfig.FAILURE_THRESHOLD, "" + 1);
Map<String, String> jobConfigMap = Maps.newHashMap();
jobConfigMap.put("Timeout", "1000");
- workflowBuilder.addJobConfigMap(jobName, jobConfigMap);
+ workflowBuilder.addJobCommandConfigMap(jobName, jobConfigMap);
_driver.start(workflowBuilder.build());
// Ensure the job completes
@@ -201,7 +201,7 @@ public class TestIndependentTaskRebalancer extends ZkTestBase {
workflowBuilder.addConfig(jobName, JobConfig.COMMAND, "DummyCommand");
Map<String, String> jobConfigMap = Maps.newHashMap();
jobConfigMap.put("Timeout", "1000");
- workflowBuilder.addJobConfigMap(jobName, jobConfigMap);
+ workflowBuilder.addJobCommandConfigMap(jobName, jobConfigMap);
_driver.start(workflowBuilder.build());
// Ensure the job completes
@@ -230,7 +230,7 @@ public class TestIndependentTaskRebalancer extends ZkTestBase {
+ (NUM_INSTANCES - 1)); // this ensures that every instance gets one chance
Map<String, String> jobConfigMap = Maps.newHashMap();
jobConfigMap.put("Timeout", "1000");
- workflowBuilder.addJobConfigMap(jobName, jobConfigMap);
+ workflowBuilder.addJobCommandConfigMap(jobName, jobConfigMap);
_driver.start(workflowBuilder.build());
// Ensure the job completes
@@ -260,7 +260,7 @@ public class TestIndependentTaskRebalancer extends ZkTestBase {
workflowBuilder.addConfig(jobName, JobConfig.COMMAND, "DummyCommand");
Map<String, String> jobConfigMap = Maps.newHashMap();
jobConfigMap.put("Timeout", "1000");
- workflowBuilder.addJobConfigMap(jobName, jobConfigMap);
+ workflowBuilder.addJobCommandConfigMap(jobName, jobConfigMap);
long inFiveSeconds = System.currentTimeMillis() + (5 * 1000);
workflowBuilder.setScheduleConfig(ScheduleConfig.oneTimeDelayedStart(new Date(inFiveSeconds)));
_driver.start(workflowBuilder.build());
http://git-wip-us.apache.org/repos/asf/helix/blob/edfc98ed/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancer.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancer.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancer.java
index 84c0e1d..aaf01a3 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancer.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancer.java
@@ -293,7 +293,7 @@ public class TestTaskRebalancer extends ZkTestBase {
public ReindexTask(TaskCallbackContext context) {
JobConfig jobCfg = context.getJobConfig();
- Map<String, String> cfg = jobCfg.getJobConfigMap();
+ Map<String, String> cfg = jobCfg.getJobCommandConfigMap();
if (cfg == null) {
cfg = Collections.emptyMap();
}
http://git-wip-us.apache.org/repos/asf/helix/blob/edfc98ed/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java
index e3e8b89..18d2df1 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestTaskRebalancerStopResume.java
@@ -182,7 +182,7 @@ public class TestTaskRebalancerStopResume extends ZkTestBase {
public ReindexTask(TaskCallbackContext context) {
JobConfig jobCfg = context.getJobConfig();
- Map<String, String> cfg = jobCfg.getJobConfigMap();
+ Map<String, String> cfg = jobCfg.getJobCommandConfigMap();
if (cfg == null) {
cfg = Collections.emptyMap();
}
http://git-wip-us.apache.org/repos/asf/helix/blob/edfc98ed/helix-core/src/test/java/org/apache/helix/integration/task/WorkflowGenerator.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/WorkflowGenerator.java b/helix-core/src/test/java/org/apache/helix/integration/task/WorkflowGenerator.java
index 921a5f9..318673f 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/WorkflowGenerator.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/WorkflowGenerator.java
@@ -84,7 +84,7 @@ public class WorkflowGenerator {
ObjectMapper mapper = new ObjectMapper();
try {
String serializedMap = mapper.writeValueAsString(commandConfig);
- builder.addConfig(jobName, JobConfig.JOB_CONFIG_MAP, serializedMap);
+ builder.addConfig(jobName, JobConfig.JOB_COMMAND_CONFIG_MAP, serializedMap);
} catch (IOException e) {
LOG.error("Error serializing " + commandConfig, e);
}
@@ -103,8 +103,8 @@ public class WorkflowGenerator {
ObjectMapper mapper = new ObjectMapper();
try {
String serializedMap = mapper.writeValueAsString(DEFAULT_COMMAND_CONFIG);
- builder.addConfig(JOB_NAME_1, JobConfig.JOB_CONFIG_MAP, serializedMap);
- builder.addConfig(JOB_NAME_2, JobConfig.JOB_CONFIG_MAP, serializedMap);
+ builder.addConfig(JOB_NAME_1, JobConfig.JOB_COMMAND_CONFIG_MAP, serializedMap);
+ builder.addConfig(JOB_NAME_2, JobConfig.JOB_COMMAND_CONFIG_MAP, serializedMap);
} catch (IOException e) {
LOG.error("Error serializing " + DEFAULT_COMMAND_CONFIG, e);
}
http://git-wip-us.apache.org/repos/asf/helix/blob/edfc98ed/recipes/jobrunner-yarn/src/main/java/org/apache/helix/provisioning/yarn/example/MyTask.java
----------------------------------------------------------------------
diff --git a/recipes/jobrunner-yarn/src/main/java/org/apache/helix/provisioning/yarn/example/MyTask.java b/recipes/jobrunner-yarn/src/main/java/org/apache/helix/provisioning/yarn/example/MyTask.java
index 650bb14..2151247 100644
--- a/recipes/jobrunner-yarn/src/main/java/org/apache/helix/provisioning/yarn/example/MyTask.java
+++ b/recipes/jobrunner-yarn/src/main/java/org/apache/helix/provisioning/yarn/example/MyTask.java
@@ -34,7 +34,7 @@ public class MyTask implements Task {
private volatile boolean _canceled;
public MyTask(TaskCallbackContext context) {
- LOG.info("Job config" + context.getJobConfig().getJobConfigMap());
+ LOG.info("Job config" + context.getJobConfig().getJobCommandConfigMap());
if (context.getTaskConfig() != null) {
LOG.info("Task config: " + context.getTaskConfig().getConfigMap());
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/helix
Posted by ka...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/helix
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/8487c71a
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/8487c71a
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/8487c71a
Branch: refs/heads/master
Commit: 8487c71a8d31d31bbd9b26b507a690bb85fcb0f2
Parents: edfc98e d35e29a
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Thu Aug 7 13:51:48 2014 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Thu Aug 7 13:51:48 2014 -0700
----------------------------------------------------------------------
.../apache/helix/webapp/TestResetInstance.java | 9 +-
.../apache/helix/webapp/TestResetResource.java | 9 +-
.../org/apache/helix/agent/AgentStateModel.java | 4 +-
.../helix/agent/AgentStateModelFactory.java | 6 +-
.../api/StateTransitionHandlerFactory.java | 114 +++++
.../org/apache/helix/api/TransitionHandler.java | 106 +++++
.../apache/helix/api/id/StateModelDefId.java | 4 +
.../helix/controller/HelixControllerMain.java | 10 +-
.../helix/manager/zk/CallbackHandler.java | 420 -------------------
.../manager/zk/ParticipantManagerHelper.java | 281 -------------
.../helix/manager/zk/ZkHelixParticipant.java | 5 +-
.../handling/HelixStateTransitionHandler.java | 14 +-
.../helix/participant/CustomCodeInvoker.java | 9 +-
.../DistClusterControllerStateModel.java | 4 +-
.../DistClusterControllerStateModelFactory.java | 8 +-
.../participant/GenericLeaderStandbyModel.java | 7 +-
.../GenericLeaderStandbyStateModelFactory.java | 9 +-
.../participant/HelixCustomCodeRunner.java | 8 +-
.../participant/HelixStateMachineEngine.java | 121 ++----
.../helix/participant/StateMachineEngine.java | 38 +-
.../statemachine/HelixStateModelFactory.java | 118 ------
.../HelixStateModelFactoryAdaptor.java | 36 --
.../statemachine/ScheduledTaskStateModel.java | 34 +-
.../ScheduledTaskStateModelFactory.java | 10 +-
.../participant/statemachine/StateModel.java | 104 -----
.../statemachine/StateModelFactory.java | 116 -----
.../statemachine/StateModelParser.java | 11 +-
.../java/org/apache/helix/task/TaskRunner.java | 6 +-
.../org/apache/helix/task/TaskStateModel.java | 4 +-
.../helix/task/TaskStateModelFactory.java | 6 +-
.../org/apache/helix/tools/ClusterSetup.java | 2 +-
.../org/apache/helix/DummyProcessThread.java | 7 +-
.../src/test/java/org/apache/helix/Mocks.java | 6 +-
.../org/apache/helix/TestHelixTaskExecutor.java | 6 +-
.../org/apache/helix/TestHelixTaskHandler.java | 8 +-
.../test/java/org/apache/helix/TestHelper.java | 29 --
.../TestAddStateModelFactoryAfterConnect.java | 5 +-
.../integration/TestBatchMessageWrapper.java | 10 +-
.../TestCorrectnessOnConnectivityLoss.java | 10 +-
.../TestDistributedClusterController.java | 144 -------
.../helix/integration/TestErrorPartition.java | 14 +-
.../helix/integration/TestHelixConnection.java | 10 +-
.../helix/integration/TestMessageThrottle2.java | 17 +-
.../helix/integration/TestMessagingService.java | 35 +-
.../integration/TestMultiClusterController.java | 144 +++++++
.../integration/TestNonOfflineInitState.java | 3 +-
.../TestPartitionLevelTransitionConstraint.java | 16 +-
.../integration/TestPreferenceListAsQueue.java | 14 +-
.../helix/integration/TestResetInstance.java | 9 +-
.../integration/TestResetPartitionState.java | 9 +-
.../helix/integration/TestResetResource.java | 9 +-
.../helix/integration/TestSchedulerMessage.java | 1 -
.../integration/TestStateTransitionTimeout.java | 21 +-
.../helix/integration/TestZkReconnect.java | 15 +-
.../manager/TestConsecutiveZkSessionExpiry.java | 3 +-
.../TestDistributedControllerManager.java | 203 ---------
.../TestHelixMultiClusterController.java | 204 +++++++++
.../manager/TestParticipantManager.java | 3 +-
.../integration/manager/TestStateModelLeak.java | 48 ++-
.../integration/manager/ZkTestManager.java | 35 --
.../manager/zk/MockMultiClusterController.java | 3 +-
.../helix/manager/zk/MockParticipant.java | 9 +-
.../TestDefaultControllerMsgHandlerFactory.java | 8 +-
.../helix/messaging/TestAsyncCallbackSvc.java | 13 +-
.../helix/mock/participant/DummyProcess.java | 37 +-
.../participant/MockBootstrapModelFactory.java | 8 +-
.../participant/MockBootstrapStateModel.java | 4 +-
.../mock/participant/MockMSModelFactory.java | 12 +-
.../mock/participant/MockMSStateModel.java | 4 +-
.../participant/MockSchemataModelFactory.java | 11 +-
.../participant/MockSchemataStateModel.java | 4 +-
.../org/apache/helix/model/TestConstraint.java | 2 +-
.../helix/participant/MockZKHelixManager.java | 2 +-
.../TestDistControllerStateModelFactory.java | 3 +-
.../statemachine/TestStateModelParser.java | 5 +-
.../apache/helix/examples/BootstrapHandler.java | 17 +-
.../apache/helix/examples/BootstrapProcess.java | 17 +-
.../apache/helix/examples/DummyParticipant.java | 13 +-
.../apache/helix/examples/ExampleProcess.java | 12 +-
.../LeaderStandbyStateModelFactory.java | 11 +-
.../helix/examples/LogicalModelExample.java | 10 +-
.../examples/MasterSlaveStateModelFactory.java | 13 +-
.../OnlineOfflineStateModelFactory.java | 11 +-
.../org/apache/helix/examples/Quickstart.java | 2 +-
.../participant/StatelessServiceStateModel.java | 4 +-
.../StatelessServiceStateModelFactory.java | 6 +-
.../java/org/apache/helix/lockmanager/Lock.java | 4 +-
.../apache/helix/lockmanager/LockFactory.java | 6 +-
.../apache/helix/recipes/rabbitmq/Consumer.java | 6 +-
.../recipes/rabbitmq/ConsumerStateModel.java | 5 +-
.../rabbitmq/ConsumerStateModelFactory.java | 40 --
.../ConsumerStateTransitionHandlerFactory.java | 40 ++
.../helix/filestore/FileStoreStateModel.java | 4 +-
.../filestore/FileStoreStateModelFactory.java | 6 +-
.../helix/taskexecution/TaskStateModel.java | 4 +-
.../taskexecution/TaskStateModelFactory.java | 6 +-
.../helix/userdefinedrebalancer/Lock.java | 4 +-
.../userdefinedrebalancer/LockFactory.java | 6 +-
98 files changed, 1008 insertions(+), 2035 deletions(-)
----------------------------------------------------------------------