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 2013/10/30 23:50:56 UTC

git commit: [HELIX-284] Support participant auto join in YAML cluster setup (fix issue), rb=15070

Updated Branches:
  refs/heads/helix-0.6.2-release 962701dfd -> 711561b8a


[HELIX-284] Support participant auto join in YAML cluster setup (fix issue), rb=15070


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

Branch: refs/heads/helix-0.6.2-release
Commit: 711561b8ad342819969c3964dc3a0af8c0c04307
Parents: 962701d
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Wed Oct 30 15:50:36 2013 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Wed Oct 30 15:50:36 2013 -0700

----------------------------------------------------------------------
 .../apache/helix/tools/YAMLClusterSetup.java    | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/711561b8/helix-core/src/main/java/org/apache/helix/tools/YAMLClusterSetup.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/tools/YAMLClusterSetup.java b/helix-core/src/main/java/org/apache/helix/tools/YAMLClusterSetup.java
index 07991a6..9ec1ef9 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/YAMLClusterSetup.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/YAMLClusterSetup.java
@@ -103,6 +103,26 @@ public class YAMLClusterSetup {
           StateModelDefinition stateModelDef =
               getStateModelDef(resource.stateModel, resource.constraints);
           helixAdmin.addStateModelDef(cfg.clusterName, resource.stateModel.name, stateModelDef);
+        } else {
+          StateModelDefinition stateModelDef = null;
+          if (resource.stateModel.name.equals("MasterSlave")) {
+            stateModelDef =
+                new StateModelDefinition(StateModelConfigGenerator.generateConfigForMasterSlave());
+          } else if (resource.stateModel.name.equals("OnlineOffline")) {
+            stateModelDef =
+                new StateModelDefinition(StateModelConfigGenerator.generateConfigForOnlineOffline());
+          } else if (resource.stateModel.name.equals("LeaderStandby")) {
+            stateModelDef =
+                new StateModelDefinition(StateModelConfigGenerator.generateConfigForLeaderStandby());
+          }
+          if (stateModelDef != null) {
+            try {
+              helixAdmin.addStateModelDef(cfg.clusterName, resource.stateModel.name, stateModelDef);
+            } catch (HelixException e) {
+              LOG.warn("State model definition " + resource.stateModel.name
+                  + " could not be added.");
+            }
+          }
         }
         int partitions = 1;
         int replicas = 1;