You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dd...@apache.org on 2011/11/04 08:03:11 UTC
svn commit: r1197411 - in
/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari:
controller/Clusters.java resource/statemachine/StateMachineInvoker.java
Author: ddas
Date: Fri Nov 4 07:03:11 2011
New Revision: 1197411
URL: http://svn.apache.org/viewvc?rev=1197411&view=rev
Log:
AMBARI-126. Minor fixes to the FSM invocations.
Modified:
incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java
incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/resource/statemachine/StateMachineInvoker.java
Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java?rev=1197411&r1=1197410&r2=1197411&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java Fri Nov 4 07:03:11 2011
@@ -340,17 +340,14 @@ public class Clusters {
/*
* Invoke state machine event
*/
- ClusterFSM clusterFSM = StateMachineInvoker.
- getStateMachineClusterInstance(cls.getName());
if(c.getGoalState().equals(ClusterState.CLUSTER_STATE_ACTIVE)) {
- clusterFSM.activate();
+ StateMachineInvoker.startCluster(cls.getName());
} else if(c.getGoalState().
equals(ClusterState.CLUSTER_STATE_INACTIVE)) {
- clusterFSM.deactivate();
+ StateMachineInvoker.stopCluster(cls.getName());
} else if(c.getGoalState().
equals(ClusterState.CLUSTER_STATE_ATTIC)) {
- clusterFSM.deactivate();
- clusterFSM.terminate();
+ StateMachineInvoker.deleteCluster(cls.getName());
}
return cls.getClusterDefinition(-1);
Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/resource/statemachine/StateMachineInvoker.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/resource/statemachine/StateMachineInvoker.java?rev=1197411&r1=1197410&r2=1197411&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/resource/statemachine/StateMachineInvoker.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/resource/statemachine/StateMachineInvoker.java Fri Nov 4 07:03:11 2011
@@ -83,6 +83,11 @@ public class StateMachineInvoker {
return clusterFSM;
}
+ public static void startCluster(String clusterId) {
+ ClusterFSM clusterFSM = clusters.get(clusterId);
+ clusterFSM.activate();
+ }
+
public static void stopCluster(String clusterId) {
ClusterFSM clusterFSM = clusters.get(clusterId);
clusterFSM.deactivate();