helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swaroop...@apache.org
Subject [3/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix
Date Fri, 19 Apr 2013 22:19:47 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix

Conflicts:
	recipes/task-execution/src/main/java/org/apache/helix/taskexecution/TaskCluster.java
	recipes/task-execution/src/main/java/org/apache/helix/taskexecution/TaskStateModel.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/18088eaa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/18088eaa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/18088eaa

Branch: refs/heads/master
Commit: 18088eaade6843cec6477b19c26f2460b652a687
Parents: dfe374d 9b6142c
Author: Swaroop Jagadish <sjagadis@sjagadis-ld.linkedin.biz>
Authored: Fri Apr 19 15:18:01 2013 -0700
Committer: Swaroop Jagadish <sjagadis@sjagadis-ld.linkedin.biz>
Committed: Fri Apr 19 15:18:01 2013 -0700

----------------------------------------------------------------------
 bump-up.command                                    |    5 +-
 .../helix-admin-webapp-0.6.0-incubator.ivy         |   47 -
 ...elix-admin-webapp-0.6.1-incubating-SNAPSHOT.ivy |   47 +
 .../helix/webapp/resources/IdealStateResource.java |    2 +-
 helix-agent/pom.xml                                |    6 +
 .../org/apache/helix/agent/AgentStateModel.java    |   39 +-
 .../java/org/apache/helix/agent/CommandConfig.java |    9 +-
 .../apache/helix/agent/ProcessMonitorThread.java   |   63 +
 .../java/org/apache/helix/agent/SystemUtil.java    |    2 +-
 .../integration-test/config/log4j-info.properties  |   23 +
 .../integration-test/config/log4j.properties       |   25 +
 .../config/zookeeper-log4j2file.properties         |   26 +
 .../integration-test/lib/dds_test_infra.tar.gz     |  Bin 0 -> 69424 bytes
 .../main/scripts/integration-test/log4j.properties |   24 +
 .../scripts/integration-test/script/cm_driver.py   |   71 +
 .../scripts/integration-test/script/dds_driver.py  | 1098 +++++++++
 .../integration-test/script/driver_cmd_dict.py     |  312 +++
 .../scripts/integration-test/script/pexpect.py     | 1864 +++++++++++++++
 .../scripts/integration-test/script/pexpect.pyc    |  Bin 0 -> 67774 bytes
 .../scripts/integration-test/script/utility.py     |  813 +++++++
 .../scripts/integration-test/script/utility.pyc    |  Bin 0 -> 40725 bytes
 .../main/scripts/integration-test/setup_env.inc    |   37 +
 .../scripts/integration-test/testcases/foo_test.py |   38 +
 .../testcases/report_pass_fail.inc                 |   40 +
 .../integration-test/testcases/setup_env.inc       |   60 +
 helix-agent/src/test/conf/testng.xml               |    2 +-
 .../org/apache/helix/agent/TestHelixAgent.java     |  180 ++
 helix-core/helix-core-0.6.0-incubator.ivy          |   69 -
 .../helix-core-0.6.1-incubating-SNAPSHOT.ivy       |   69 +
 .../main/java/org/apache/helix/HelixManager.java   |    8 +
 .../org/apache/helix/HelixManagerProperties.java   |  156 ++
 .../controller/stages/CompatibilityCheckStage.java |   88 +-
 .../stages/ResourceComputationStage.java           |    4 +-
 .../controller/stages/TaskAssignmentStage.java     |   46 +-
 .../helix/examples/IdealStateBuilderExample.java   |  149 ++
 .../apache/helix/manager/zk/ZKHelixManager.java    |   15 +-
 .../java/org/apache/helix/manager/zk/ZKUtil.java   |    4 +-
 .../java/org/apache/helix/model/IdealState.java    |    9 +-
 .../org/apache/helix/model/InstanceConfig.java     |   13 +-
 .../main/java/org/apache/helix/model/Resource.java |   10 +-
 .../helix/model/builder/IdealStateBuilder.java     |    3 +-
 .../java/org/apache/helix/tools/ClusterSetup.java  |  181 +-
 .../org/apache/helix/tools/PropertiesReader.java   |   60 -
 .../resources/cluster-manager-version.properties   |    5 +-
 .../src/test/java/org/apache/helix/Mocks.java      |   11 +
 .../java/org/apache/helix/TestConfigAccessor.java  |    2 +
 .../org/apache/helix/TestHelixConfigAccessor.java  |   12 +-
 .../src/test/java/org/apache/helix/TestHelper.java |    2 +-
 .../controller/stages/DummyClusterManager.java     |    7 +
 .../stages/TestCompatibilityCheckStage.java        |   43 +-
 .../apache/helix/integration/TestAddClusterV2.java |    4 +-
 .../TestAddNodeAfterControllerStart.java           |    6 +-
 .../helix/integration/TestAutoRebalance.java       |    6 +-
 .../TestAutoRebalancePartitionLimit.java           |    4 +-
 .../apache/helix/integration/TestBatchMessage.java |   86 +
 .../helix/integration/TestClusterStartsup.java     |    2 +-
 .../helix/integration/TestDistributedCMMain.java   |    2 +-
 .../org/apache/helix/integration/TestDriver.java   |    2 +-
 .../helix/integration/TestExpandCluster.java       |    2 +-
 .../helix/integration/TestNonOfflineInitState.java |    2 +-
 .../integration/TestStateTransitionTimeout.java    |    2 +-
 .../helix/integration/ZkStandAloneCMTestBase.java  |    2 +-
 .../helix/participant/MockZKHelixManager.java      |    7 +
 .../org/apache/helix/tools/TestClusterSetup.java   |   54 +-
 recipes/distributed-lock-manager/pom.xml           |    5 +
 .../src/test/conf/testng.xml                       |   27 +
 recipes/rabbitmq-consumer-group/pom.xml            |    7 +-
 .../src/test/conf/testng.xml                       |   27 +
 recipes/rsync-replicated-file-system/pom.xml       |    5 +
 .../apache/helix/filestore/IntegrationTest.java    |   10 +-
 .../src/test/conf/testng.xml                       |   27 +
 recipes/task-execution/pom.xml                     |    5 +
 .../apache/helix/taskexecution/TaskCluster.java    |    8 +-
 .../apache/helix/taskexecution/TaskStateModel.java |    7 +-
 recipes/task-execution/src/test/conf/testng.xml    |   27 +
 75 files changed, 5613 insertions(+), 522 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/18088eaa/recipes/task-execution/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/18088eaa/recipes/task-execution/src/main/java/org/apache/helix/taskexecution/TaskCluster.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/18088eaa/recipes/task-execution/src/main/java/org/apache/helix/taskexecution/TaskStateModel.java
----------------------------------------------------------------------
diff --cc recipes/task-execution/src/main/java/org/apache/helix/taskexecution/TaskStateModel.java
index e278d80,4251a6e..08db29b
--- a/recipes/task-execution/src/main/java/org/apache/helix/taskexecution/TaskStateModel.java
+++ b/recipes/task-execution/src/main/java/org/apache/helix/taskexecution/TaskStateModel.java
@@@ -24,11 -24,12 +24,14 @@@ import java.util.Set
  import org.apache.log4j.Logger;
  
  import org.apache.helix.ConfigAccessor;
 +import org.apache.helix.model.ConfigScope;
 +import org.apache.helix.model.builder.ConfigScopeBuilder;
  import org.apache.helix.HelixManager;
  import org.apache.helix.NotificationContext;
+ import org.apache.helix.model.HelixConfigScope;
  import org.apache.helix.model.Message;
+ import org.apache.helix.model.HelixConfigScope.ConfigScopeProperty;
+ import org.apache.helix.model.builder.HelixConfigScopeBuilder;
  import org.apache.helix.participant.statemachine.StateModel;
  import org.apache.helix.participant.statemachine.StateModelInfo;
  import org.apache.helix.participant.statemachine.Transition;


Mime
View raw message