AMBARI-806. Remove State object as configs/stack version/running state are handled as standalone entities. (hitesh)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1393911 13f79535-47bb-0310-9956-ffa450edef68

AMBARI-666-CHANGES.txt

@@ -12,6 +12,9 @@ AMBARI-666 branch (unreleased changes)
 
   NEW FEATURES
 
+  AMBARI-806. Remove State object as configs/stack version/running state are
+  handled as standalone entities. (hitesh)
+
   AMBARI-805. Add requestId tracking objects for management spi. (hitesh)
 
   AMBARI-803. FSM initial refactoring for eventual live/desired objects. (hitesh)

ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java

@@ -25,13 +25,12 @@ import org.apache.ambari.server.actionmanager.ActionManager;
 import org.apache.ambari.server.state.AgentVersion;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
-import org.apache.ambari.server.state.DeployState;
+import org.apache.ambari.server.state.State;
 import org.apache.ambari.server.state.Host;
 import org.apache.ambari.server.state.HostState;
 import org.apache.ambari.server.state.Service;
 import org.apache.ambari.server.state.ServiceComponent;
 import org.apache.ambari.server.state.ServiceComponentHost;
-import org.apache.ambari.server.state.State;
 import org.apache.ambari.server.state.fsm.InvalidStateTransitonException;
 import org.apache.ambari.server.state.live.host.HostHealthyHeartbeatEvent;
 import org.apache.ambari.server.state.live.host.HostRegistrationRequestEvent;
@@ -103,12 +102,11 @@ public class HeartBeatHandler {
               status.getComponentName());
           ServiceComponentHost scHost = svcComp.getServiceComponentHost(
               hostname);
-          State currentState = scHost.getState();
-          DeployState liveState = DeployState
-              .valueOf(DeployState.class, status.getStatus());
+          State liveState = State
+              .valueOf(State.class, status.getStatus());
           // Hack
-          scHost.setState(new State(currentState
-              .getConfigVersion(), currentState.getStackVersion(), liveState));
+          scHost.setState(liveState);
+          // TODO need to get config version and stack version from live state
         }
       }
     }

ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java

@@ -28,7 +28,7 @@ import org.apache.ambari.server.controller.spi.Predicate;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Config;
-import org.apache.ambari.server.state.DeployState;
+import org.apache.ambari.server.state.State;
 import org.apache.ambari.server.state.ServiceImpl;
 import org.apache.ambari.server.state.live.ClustersImpl;
 
@@ -64,7 +64,7 @@ public class AmbariManagementControllerImpl implements
       // TODO initialize configs based off service.configVersions
       // TODO error check if service is already added and/or enabled/deployed      
       cluster.addService(new ServiceImpl(cluster, service.getServiceName(),
-          DeployState.valueOf(service.getDesiredState()), configs));
+          State.valueOf(service.getDesiredState()), configs));
       
       // TODO take action based on desired state
     }

ambari-server/src/main/java/org/apache/ambari/server/state/DeployState.java

@@ -1,110 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ambari.server.state;
-
-public enum DeployState {
-  /**
-   * Initial/Clean state
-   */
-  INIT(0),
-  /**
-   * In the process of installing.
-   */
-  INSTALLING(1),
-  /**
-   * Install failed
-   */
-  INSTALL_FAILED(2),
-  /**
-   * State when install completed successfully
-   */
-  INSTALLED(3),
-  /**
-   * In the process of starting.
-   */
-  STARTING(4),
-  /**
-   * Start failed.
-   */
-  START_FAILED(5),
-  /**
-   * State when start completed successfully.
-   */
-  STARTED(6),
-  /**
-   * In the process of stopping.
-   */
-  STOPPING(7),
-  /**
-   * Stop failed
-   */
-  STOP_FAILED(8),
-  /**
-   * In the process of uninstalling.
-   */
-  UNINSTALLING(9),
-  /**
-   * Uninstall failed.
-   */
-  UNINSTALL_FAILED(10),
-  /**
-   * State when uninstall completed successfully.
-   */
-  UNINSTALLED(11),
-  /**
-   * In the process of wiping out the install
-   */
-  WIPING_OUT(12),
-  /**
-   * State when wipeout fails
-   */
-  WIPEOUT_FAILED(13);
-  
-  private final int state;
-  
-  private DeployState(int state) {
-    this.state = state;
-  }
-  
-  public boolean isValidDesiredState() {
-    switch (DeployState.values()[this.state]) {
-      case INIT:
-      case INSTALLED:
-      case STARTED:
-      case UNINSTALLED:
-        return true;
-      default:
-        return false;
-    }
-  }
-  
-  public boolean isInProgressState() {
-    switch (DeployState.values()[this.state]) {
-      case INSTALLING:
-      case STARTING:
-      case STOPPING:
-      case UNINSTALLING:
-      case WIPING_OUT:
-        return true;
-      default:
-        return false;
-    }
-  }
-  
-}

ambari-server/src/main/java/org/apache/ambari/server/state/Service.java

@@ -36,9 +36,9 @@ public interface Service {
 
   public void addServiceComponents(Map<String, ServiceComponent> components);
 
-  public DeployState getState();
+  public State getState();
   
-  public void setState(DeployState state);
+  public void setState(State state);
 
   public Map<String, Config> getConfigs();
 

ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponent.java

@@ -29,9 +29,9 @@ public interface ServiceComponent {
 
   public long getClusterId();
   
-  public DeployState getState();
+  public State getState();
   
-  public void setState(DeployState state);
+  public void setState(State state);
 
   public Map<String, Config> getConfigs();
 

ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHost.java

@@ -19,6 +19,7 @@
 package org.apache.ambari.server.state;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ambari.server.state.fsm.InvalidStateTransitonException;
 import org.apache.ambari.server.state.live.job.Job;
@@ -56,19 +57,6 @@ public interface ServiceComponentHost {
    */
   public List<Job> getJobs();
 
-
-  /**
-   * Get ServiceComponent-Host State
-   * @return ServiceComponentHostState
-   */
-  public State getState();
-
-  /**
-   * Set the State for this ServiceComponent-Host
-   * @param state ServiceComponentHostState to set to
-   */
-  public void setState(State state);
-
   /**
    * Send a ServiceComponentHostState event to the StateMachine
    * @param event Event to handle
@@ -77,4 +65,16 @@ public interface ServiceComponentHost {
   public void handleEvent(ServiceComponentHostEvent event)
       throws InvalidStateTransitonException;
 
+  public State getState();
+  
+  public void setState(State state);
+
+  public Map<String, Config> getConfigs();
+
+  public void updateConfigs(Map<String, Config> configs);
+  
+  public StackVersion getStackVersion();
+  
+  public void setStackVersion(StackVersion stackVersion);
+  
 }

ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java

@@ -29,7 +29,7 @@ public class ServiceComponentImpl implements ServiceComponent {
   
   private final String componentName;
   
-  private DeployState state;
+  private State state;
   
   private Map<String, Config> configs;
 
@@ -43,7 +43,7 @@ public class ServiceComponentImpl implements ServiceComponent {
   }
   
   public ServiceComponentImpl(Service service,
-      String componentName, DeployState state, Map<String, Config> configs) {
+      String componentName, State state, Map<String, Config> configs) {
     this.service = service;
     this.componentName = componentName;
     this.state = state;
@@ -56,6 +56,12 @@ public class ServiceComponentImpl implements ServiceComponent {
     init();
   }
   
+  public ServiceComponentImpl(Service service,
+      String componentName) {
+    this(service, componentName, State.INIT, null);
+  }
+  
+  
   @Override
   public synchronized String getName() {
     return componentName;
@@ -72,12 +78,12 @@ public class ServiceComponentImpl implements ServiceComponent {
   }
 
   @Override
-  public synchronized DeployState getState() {
+  public synchronized State getState() {
     return state;
   }
 
   @Override
-  public synchronized void setState(DeployState state) {
+  public synchronized void setState(State state) {
     this.state = state;
   }
 

ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java

@@ -27,7 +27,7 @@ public class ServiceImpl implements Service {
 
   private final Cluster cluster;
   private final String serviceName;
-  private DeployState state;
+  private State state;
   private Map<String, Config> configs;
   private Map<String, ServiceComponent> components;
   private StackVersion stackVersion;
@@ -38,7 +38,7 @@ public class ServiceImpl implements Service {
   }
   
   public ServiceImpl(Cluster cluster, String serviceName,
-      DeployState state, Map<String, Config> configs) {
+      State state, Map<String, Config> configs) {
     this.cluster = cluster;
     this.serviceName = serviceName;
     this.state = state;
@@ -53,11 +53,11 @@ public class ServiceImpl implements Service {
 
   public ServiceImpl(Cluster cluster, String serviceName,
       Map<String, Config> configs) {
-    this(cluster, serviceName, DeployState.INIT, configs);
+    this(cluster, serviceName, State.INIT, configs);
   }
   
   public ServiceImpl(Cluster cluster, String serviceName) {
-    this(cluster, serviceName, DeployState.INIT, null);
+    this(cluster, serviceName, State.INIT, null);
   }
   
   @Override
@@ -82,12 +82,12 @@ public class ServiceImpl implements Service {
   }
 
   @Override
-  public synchronized DeployState getState() {
+  public synchronized State getState() {
     return state;
   }
 
   @Override
-  public synchronized void setState(DeployState state) {
+  public synchronized void setState(State state) {
     this.state = state;
   }
 

ambari-server/src/main/java/org/apache/ambari/server/state/State.java

@@ -18,115 +18,93 @@
 
 package org.apache.ambari.server.state;
 
-
-public class State {
-
-  private final int hashCodePrime = 131;
-
-  private ConfigVersion configVersion;
-  private StackVersion stackVersion;
-  private DeployState deployState;
-
-  public State(ConfigVersion configVersion,
-      StackVersion stackVersion, DeployState state) {
-    super();
-    this.configVersion = configVersion;
-    this.stackVersion = stackVersion;
-    this.deployState = state;
-  }
-
-  public State() {
-    super();
-    this.configVersion = null;
-    this.stackVersion = null;
-    this.deployState = DeployState.INIT;
-  }
-
-
+public enum State {
   /**
-   * @return the configVersion
+   * Initial/Clean state
    */
-  public ConfigVersion getConfigVersion() {
-    return configVersion;
-  }
+  INIT(0),
   /**
-   * @param configVersion the configVersion to set
+   * In the process of installing.
    */
-  public void setConfigVersion(ConfigVersion configVersion) {
-    this.configVersion = configVersion;
-  }
+  INSTALLING(1),
   /**
-   * @return the stackVersion
+   * Install failed
    */
-  public StackVersion getStackVersion() {
-    return stackVersion;
-  }
+  INSTALL_FAILED(2),
   /**
-   * @param stackVersion the stackVersion to set
+   * State when install completed successfully
    */
-  public void setStackVersion(StackVersion stackVersion) {
-    this.stackVersion = stackVersion;
-  }
+  INSTALLED(3),
   /**
-   * @return the state
+   * In the process of starting.
    */
-  public DeployState getLiveState() {
-    return deployState;
-  }
+  STARTING(4),
+  /**
+   * Start failed.
+   */
+  START_FAILED(5),
   /**
-   * @param state the state to set
+   * State when start completed successfully.
    */
-  public void setState(DeployState state) {
-    this.deployState = state;
+  STARTED(6),
+  /**
+   * In the process of stopping.
+   */
+  STOPPING(7),
+  /**
+   * Stop failed
+   */
+  STOP_FAILED(8),
+  /**
+   * In the process of uninstalling.
+   */
+  UNINSTALLING(9),
+  /**
+   * Uninstall failed.
+   */
+  UNINSTALL_FAILED(10),
+  /**
+   * State when uninstall completed successfully.
+   */
+  UNINSTALLED(11),
+  /**
+   * In the process of wiping out the install
+   */
+  WIPING_OUT(12),
+  /**
+   * State when wipeout fails
+   */
+  WIPEOUT_FAILED(13);
+  
+  private final int state;
+  
+  private State(int state) {
+    this.state = state;
   }
-
-
-  public String toString() {
-    String out = "[";
-    out += " StackVersion=";
-    if (stackVersion != null) {
-      out += stackVersion;
-    } else {
-      out += "null";
-    }
-    out += ", ConfigVersion=";
-    if (configVersion != null) {
-      out += configVersion;
-    } else {
-      out += "null";
+  
+  public boolean isValidDesiredState() {
+    switch (State.values()[this.state]) {
+      case INIT:
+      case INSTALLED:
+      case STARTED:
+      case UNINSTALLED:
+        return true;
+      default:
+        return false;
     }
-    out += ", state=" + deployState;
-    return out;
   }
-
-  @Override
-  public boolean equals(Object object) {
-    if (!(object instanceof State)) {
-      return false;
-    }
-    if (this == object) {
-      return true;
-    }
-    State s = (State) object;
-
-    if (configVersion != null ?
-        !configVersion.equals(s.configVersion) : s.configVersion != null) {
-      return false;
-    }
-    if (stackVersion != null ?
-        !stackVersion.equals(s.stackVersion) : s.stackVersion != null) {
-      return false;
+  
+  public boolean isInProgressState() {
+    switch (State.values()[this.state]) {
+      case INSTALLING:
+      case STARTING:
+      case STOPPING:
+      case UNINSTALLING:
+      case WIPING_OUT:
+        return true;
+      default:
+        return false;
     }
-    return deployState.equals(s.deployState);
   }
-
-  @Override
-  public int hashCode() {
-    int result = configVersion != null ? configVersion.hashCode() : 0;
-    result += hashCodePrime * result +
-        ( stackVersion != null ? stackVersion.hashCode() : 0 );
-    result += deployState.hashCode();
-    return result;
-  }
-
+  
 }

ambari-server/src/main/java/org/apache/ambari/server/state/live/svccomphost/ServiceComponentHostImpl.java

@@ -18,16 +18,20 @@
 
 package org.apache.ambari.server.state.live.svccomphost;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.ambari.server.state.DeployState;
+import org.apache.ambari.server.state.Config;
+import org.apache.ambari.server.state.State;
+import org.apache.ambari.server.state.ServiceComponent;
 import org.apache.ambari.server.state.ServiceComponentHost;
 import org.apache.ambari.server.state.ServiceComponentHostEvent;
 import org.apache.ambari.server.state.ServiceComponentHostEventType;
-import org.apache.ambari.server.state.State;
+import org.apache.ambari.server.state.StackVersion;
 import org.apache.ambari.server.state.fsm.InvalidStateTransitonException;
 import org.apache.ambari.server.state.fsm.SingleArcTransition;
 import org.apache.ambari.server.state.fsm.StateMachine;
@@ -44,245 +48,244 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
   private final Lock readLock;
   private final Lock writeLock;
 
-  private State state;
-
-  private final long clusterId;
-  private final String serviceName;
-  private final String serviceComponentName;
+  private final ServiceComponent serviceComponent;
   private final String hostName;
 
+  private Map<String, Config> configs;
+  private StackVersion stackVersion;
+
   private long lastOpStartTime;
   private long lastOpEndTime;
   private long lastOpLastUpdateTime;
 
   private static final StateMachineFactory
-  <ServiceComponentHostImpl, DeployState,
+  <ServiceComponentHostImpl, State,
   ServiceComponentHostEventType, ServiceComponentHostEvent>
     daemonStateMachineFactory
       = new StateMachineFactory<ServiceComponentHostImpl,
-          DeployState, ServiceComponentHostEventType,
+          State, ServiceComponentHostEventType,
           ServiceComponentHostEvent>
-          (DeployState.INIT)
+          (State.INIT)
 
   // define the state machine of a HostServiceComponent for runnable
   // components
 
-     .addTransition(DeployState.INIT,
-         DeployState.INSTALLING,
+     .addTransition(State.INIT,
+         State.INSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_INSTALL,
          new ServiceComponentHostOpStartedTransition())
-     .addTransition(DeployState.INSTALLING,
-         DeployState.INSTALLED,
+     .addTransition(State.INSTALLING,
+         State.INSTALLED,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_SUCCEEDED,
          new ServiceComponentHostOpCompletedTransition())
-     .addTransition(DeployState.INSTALLING,
-         DeployState.INSTALLING,
+     .addTransition(State.INSTALLING,
+         State.INSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_IN_PROGRESS,
          new ServiceComponentHostOpInProgressTransition())
-     .addTransition(DeployState.INSTALLING,
-         DeployState.INSTALL_FAILED,
+     .addTransition(State.INSTALLING,
+         State.INSTALL_FAILED,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_FAILED,
          new ServiceComponentHostOpCompletedTransition())
 
-     .addTransition(DeployState.INSTALL_FAILED,
-         DeployState.INSTALLING,
+     .addTransition(State.INSTALL_FAILED,
+         State.INSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_RESTART,
          new ServiceComponentHostOpStartedTransition())
 
-     .addTransition(DeployState.INSTALLED,
-         DeployState.STARTING,
+     .addTransition(State.INSTALLED,
+         State.STARTING,
          ServiceComponentHostEventType.HOST_SVCCOMP_START,
          new ServiceComponentHostOpStartedTransition())
-     .addTransition(DeployState.INSTALLED,
-         DeployState.UNINSTALLING,
+     .addTransition(State.INSTALLED,
+         State.UNINSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_UNINSTALL,
          new ServiceComponentHostOpStartedTransition())
-     .addTransition(DeployState.INSTALLED,
-         DeployState.INSTALLING,
+     .addTransition(State.INSTALLED,
+         State.INSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_INSTALL,
          new ServiceComponentHostOpStartedTransition())
 
-     .addTransition(DeployState.STARTING,
-         DeployState.STARTING,
+     .addTransition(State.STARTING,
+         State.STARTING,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_IN_PROGRESS,
          new ServiceComponentHostOpInProgressTransition())
-     .addTransition(DeployState.STARTING,
-         DeployState.STARTED,
+     .addTransition(State.STARTING,
+         State.STARTED,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_SUCCEEDED,
          new ServiceComponentHostOpCompletedTransition())
-     .addTransition(DeployState.STARTING,
-         DeployState.START_FAILED,
+     .addTransition(State.STARTING,
+         State.START_FAILED,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_FAILED,
          new ServiceComponentHostOpCompletedTransition())
 
-     .addTransition(DeployState.START_FAILED,
-         DeployState.STARTING,
+     .addTransition(State.START_FAILED,
+         State.STARTING,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_RESTART,
          new ServiceComponentHostOpStartedTransition())
 
-     .addTransition(DeployState.STARTED,
-         DeployState.STOPPING,
+     .addTransition(State.STARTED,
+         State.STOPPING,
          ServiceComponentHostEventType.HOST_SVCCOMP_STOP,
          new ServiceComponentHostOpStartedTransition())
 
-     .addTransition(DeployState.STOPPING,
-         DeployState.STOPPING,
+     .addTransition(State.STOPPING,
+         State.STOPPING,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_IN_PROGRESS,
          new ServiceComponentHostOpInProgressTransition())
-     .addTransition(DeployState.STOPPING,
-         DeployState.INSTALLED,
+     .addTransition(State.STOPPING,
+         State.INSTALLED,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_SUCCEEDED,
          new ServiceComponentHostOpCompletedTransition())
-     .addTransition(DeployState.STOPPING,
-         DeployState.STOP_FAILED,
+     .addTransition(State.STOPPING,
+         State.STOP_FAILED,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_FAILED,
          new ServiceComponentHostOpCompletedTransition())
 
-     .addTransition(DeployState.STOP_FAILED,
-         DeployState.STOPPING,
+     .addTransition(State.STOP_FAILED,
+         State.STOPPING,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_RESTART,
          new ServiceComponentHostOpStartedTransition())
 
-     .addTransition(DeployState.UNINSTALLING,
-         DeployState.UNINSTALLING,
+     .addTransition(State.UNINSTALLING,
+         State.UNINSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_IN_PROGRESS,
          new ServiceComponentHostOpInProgressTransition())
-     .addTransition(DeployState.UNINSTALLING,
-         DeployState.UNINSTALLED,
+     .addTransition(State.UNINSTALLING,
+         State.UNINSTALLED,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_SUCCEEDED,
          new ServiceComponentHostOpCompletedTransition())
-     .addTransition(DeployState.UNINSTALLING,
-         DeployState.UNINSTALL_FAILED,
+     .addTransition(State.UNINSTALLING,
+         State.UNINSTALL_FAILED,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_FAILED,
          new ServiceComponentHostOpCompletedTransition())
 
-     .addTransition(DeployState.UNINSTALL_FAILED,
-         DeployState.UNINSTALLING,
+     .addTransition(State.UNINSTALL_FAILED,
+         State.UNINSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_RESTART,
          new ServiceComponentHostOpStartedTransition())
 
-     .addTransition(DeployState.UNINSTALLED,
-         DeployState.INSTALLING,
+     .addTransition(State.UNINSTALLED,
+         State.INSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_INSTALL,
          new ServiceComponentHostOpStartedTransition())
 
-     .addTransition(DeployState.UNINSTALLED,
-         DeployState.WIPING_OUT,
+     .addTransition(State.UNINSTALLED,
+         State.WIPING_OUT,
          ServiceComponentHostEventType.HOST_SVCCOMP_WIPEOUT,
          new ServiceComponentHostOpStartedTransition())
 
-     .addTransition(DeployState.WIPING_OUT,
-         DeployState.WIPING_OUT,
+     .addTransition(State.WIPING_OUT,
+         State.WIPING_OUT,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_IN_PROGRESS,
          new ServiceComponentHostOpInProgressTransition())
-     .addTransition(DeployState.WIPING_OUT,
-         DeployState.INIT,
+     .addTransition(State.WIPING_OUT,
+         State.INIT,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_SUCCEEDED,
          new ServiceComponentHostOpCompletedTransition())
-     .addTransition(DeployState.WIPING_OUT,
-         DeployState.WIPEOUT_FAILED,
+     .addTransition(State.WIPING_OUT,
+         State.WIPEOUT_FAILED,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_FAILED,
          new ServiceComponentHostOpCompletedTransition())
-     .addTransition(DeployState.WIPEOUT_FAILED,
-         DeployState.WIPING_OUT,
+     .addTransition(State.WIPEOUT_FAILED,
+         State.WIPING_OUT,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_RESTART,
          new ServiceComponentHostOpStartedTransition())
 
      .installTopology();
 
   private static final StateMachineFactory
-  <ServiceComponentHostImpl, DeployState,
+  <ServiceComponentHostImpl, State,
   ServiceComponentHostEventType, ServiceComponentHostEvent>
     clientStateMachineFactory
       = new StateMachineFactory<ServiceComponentHostImpl,
-          DeployState, ServiceComponentHostEventType,
+          State, ServiceComponentHostEventType,
           ServiceComponentHostEvent>
-          (DeployState.INIT)
+          (State.INIT)
 
   // define the state machine of a HostServiceComponent for client only
   // components
 
-     .addTransition(DeployState.INIT,
-         DeployState.INSTALLING,
+     .addTransition(State.INIT,
+         State.INSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_INSTALL,
          new ServiceComponentHostOpStartedTransition())
 
-     .addTransition(DeployState.INSTALLING,
-         DeployState.INSTALLED,
+     .addTransition(State.INSTALLING,
+         State.INSTALLED,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_SUCCEEDED,
          new ServiceComponentHostOpCompletedTransition())
-     .addTransition(DeployState.INSTALLING,
-         DeployState.INSTALLING,
+     .addTransition(State.INSTALLING,
+         State.INSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_IN_PROGRESS,
          new ServiceComponentHostOpInProgressTransition())
-     .addTransition(DeployState.INSTALLING,
-         DeployState.INSTALL_FAILED,
+     .addTransition(State.INSTALLING,
+         State.INSTALL_FAILED,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_FAILED,
          new ServiceComponentHostOpCompletedTransition())
 
-     .addTransition(DeployState.INSTALL_FAILED,
-         DeployState.INSTALLING,
+     .addTransition(State.INSTALL_FAILED,
+         State.INSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_RESTART,
          new ServiceComponentHostOpStartedTransition())
 
-     .addTransition(DeployState.INSTALLED,
-         DeployState.UNINSTALLING,
+     .addTransition(State.INSTALLED,
+         State.UNINSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_UNINSTALL,
          new ServiceComponentHostOpStartedTransition())
-     .addTransition(DeployState.INSTALLED,
-         DeployState.INSTALLING,
+     .addTransition(State.INSTALLED,
+         State.INSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_INSTALL,
          new ServiceComponentHostOpStartedTransition())
 
-     .addTransition(DeployState.UNINSTALLING,
-         DeployState.UNINSTALLING,
+     .addTransition(State.UNINSTALLING,
+         State.UNINSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_IN_PROGRESS,
          new ServiceComponentHostOpInProgressTransition())
-     .addTransition(DeployState.UNINSTALLING,
-         DeployState.UNINSTALLED,
+     .addTransition(State.UNINSTALLING,
+         State.UNINSTALLED,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_SUCCEEDED,
          new ServiceComponentHostOpCompletedTransition())
-     .addTransition(DeployState.UNINSTALLING,
-         DeployState.UNINSTALL_FAILED,
+     .addTransition(State.UNINSTALLING,
+         State.UNINSTALL_FAILED,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_FAILED,
          new ServiceComponentHostOpCompletedTransition())
 
-     .addTransition(DeployState.UNINSTALL_FAILED,
-         DeployState.UNINSTALLING,
+     .addTransition(State.UNINSTALL_FAILED,
+         State.UNINSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_RESTART,
          new ServiceComponentHostOpStartedTransition())
 
-     .addTransition(DeployState.UNINSTALLED,
-         DeployState.INSTALLING,
+     .addTransition(State.UNINSTALLED,
+         State.INSTALLING,
          ServiceComponentHostEventType.HOST_SVCCOMP_INSTALL,
          new ServiceComponentHostOpStartedTransition())
 
-     .addTransition(DeployState.UNINSTALLED,
-         DeployState.WIPING_OUT,
+     .addTransition(State.UNINSTALLED,
+         State.WIPING_OUT,
          ServiceComponentHostEventType.HOST_SVCCOMP_WIPEOUT,
          new ServiceComponentHostOpStartedTransition())
 
-     .addTransition(DeployState.WIPING_OUT,
-         DeployState.WIPING_OUT,
+     .addTransition(State.WIPING_OUT,
+         State.WIPING_OUT,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_IN_PROGRESS,
          new ServiceComponentHostOpInProgressTransition())
-     .addTransition(DeployState.WIPING_OUT,
-         DeployState.INIT,
+     .addTransition(State.WIPING_OUT,
+         State.INIT,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_SUCCEEDED,
          new ServiceComponentHostOpCompletedTransition())
-     .addTransition(DeployState.WIPING_OUT,
-         DeployState.WIPEOUT_FAILED,
+     .addTransition(State.WIPING_OUT,
+         State.WIPEOUT_FAILED,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_FAILED,
          new ServiceComponentHostOpCompletedTransition())
-     .addTransition(DeployState.WIPEOUT_FAILED,
-         DeployState.WIPING_OUT,
+     .addTransition(State.WIPEOUT_FAILED,
+         State.WIPING_OUT,
          ServiceComponentHostEventType.HOST_SVCCOMP_OP_RESTART,
          new ServiceComponentHostOpStartedTransition())
 
      .installTopology();
 
 
-  private final StateMachine<DeployState,
+  private final StateMachine<State,
       ServiceComponentHostEventType, ServiceComponentHostEvent> stateMachine;
 
   static class ServiceComponentHostOpCompletedTransition
@@ -364,8 +367,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
     }
   }
 
-  public ServiceComponentHostImpl(long clusterId,
-      String serviceName, String serviceComponentName,
+  public ServiceComponentHostImpl(ServiceComponent serviceComponent,
       String hostName, boolean isClient) {
     super();
     if (isClient) {
@@ -376,11 +378,8 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
     ReadWriteLock rwLock = new ReentrantReadWriteLock();
     this.readLock = rwLock.readLock();
     this.writeLock = rwLock.writeLock();
-    this.clusterId = clusterId;
-    this.serviceName = serviceName;
-    this.serviceComponentName = serviceComponentName;
+    this.serviceComponent = serviceComponent;
     this.hostName = hostName;
-    this.state = new State();
     this.resetLastOpInfo();
   }
 
@@ -388,7 +387,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
   public State getState() {
     try {
       readLock.lock();
-      return state;
+      return stateMachine.getCurrentState();
     }
     finally {
       readLock.unlock();
@@ -399,8 +398,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
   public void setState(State state) {
     try {
       writeLock.lock();
-      this.state = state;
-      stateMachine.setCurrentState(state.getLiveState());
+      stateMachine.setCurrentState(state);
     }
     finally {
       writeLock.unlock();
@@ -420,7 +418,6 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
       writeLock.lock();
       try {
         stateMachine.doTransition(event.getType(), event);
-        state.setState(stateMachine.getCurrentState());
         // TODO Audit logs
       } catch (InvalidStateTransitonException e) {
         LOG.error("Can't handle ServiceComponentHostEvent event at"
@@ -436,7 +433,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
     finally {
       writeLock.unlock();
     }
-    if (oldState.getLiveState() != getState().getLiveState()) {
+    if (!oldState.equals(getState())) {
       if (LOG.isDebugEnabled()) {
         LOG.debug("ServiceComponentHost transitioned to a new state"
             + ", serviceComponentName=" + this.getServiceComponentName()
@@ -457,7 +454,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
 
   @Override
   public String getServiceComponentName() {
-    return serviceComponentName;
+    return serviceComponent.getName();
   }
 
   @Override
@@ -545,12 +542,56 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
 
   @Override
   public long getClusterId() {
-    return clusterId;
+    return serviceComponent.getClusterId();
   }
 
   @Override
   public String getServiceName() {
-    return serviceName;
+    return serviceComponent.getServiceName();
+  }
+
+  @Override
+  public Map<String, Config> getConfigs() {
+    try {
+      readLock.lock();
+      return Collections.unmodifiableMap(configs);
+    }
+    finally {
+      readLock.unlock();
+    }
+  }
+
+  @Override
+  public void updateConfigs(Map<String, Config> configs) {
+    try {
+      writeLock.lock();
+      this.configs.putAll(configs);
+    }
+    finally {
+      writeLock.unlock();
+    }
+  }
+
+  @Override
+  public StackVersion getStackVersion() {
+    try {
+      readLock.lock();
+      return stackVersion;
+    }
+    finally {
+      readLock.unlock();
+    }
+  }
+
+  @Override
+  public void setStackVersion(StackVersion stackVersion) {
+    try {
+      writeLock.lock();
+      this.stackVersion = stackVersion;
+    }
+    finally {
+      writeLock.unlock();
+    }
   }
 
 }

ambari-server/src/test/java/org/apache/ambari/server/state/DeployStateTest.java

@@ -1,65 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ambari.server.state;
-
-import junit.framework.Assert;
-
-import org.apache.ambari.server.state.ConfigVersion;
-import org.apache.ambari.server.state.DeployState;
-import org.apache.ambari.server.state.StackVersion;
-import org.apache.ambari.server.state.State;
-import org.junit.Test;
-
-public class DeployStateTest {
-
-  @Test
-  public void testEquals() {
-    State s1 = new State();
-    State s2 = new State();
-
-    Assert.assertTrue(s1.equals(s2));
-
-    s1.setConfigVersion(new ConfigVersion("x.y.z"));
-    Assert.assertFalse(s1.equals(s2));
-    Assert.assertFalse(s2.equals(s1));
-
-    s2.setConfigVersion(new ConfigVersion("x.y.foo"));
-    Assert.assertFalse(s1.equals(s2));
-    Assert.assertFalse(s2.equals(s1));
-
-    s2.setConfigVersion(new ConfigVersion("x.y.z"));
-    Assert.assertTrue(s1.equals(s2));
-
-    s2.setStackVersion(new StackVersion("1.x"));
-    Assert.assertFalse(s1.equals(s2));
-    Assert.assertFalse(s2.equals(s1));
-
-    s1.setStackVersion(new StackVersion("1.x"));
-    Assert.assertTrue(s1.equals(s2));
-
-    s1.setStackVersion(new StackVersion("2.x"));
-    Assert.assertFalse(s1.equals(s2));
-    Assert.assertFalse(s2.equals(s1));
-
-    s1.setState(DeployState.INSTALLED);
-    Assert.assertFalse(s1.equals(s2));
-
-  }
-
-}

ambari-server/src/test/java/org/apache/ambari/server/state/live/TestClusterImpl.java

@@ -32,10 +32,9 @@ import org.apache.ambari.server.state.AgentVersion;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.ConfigVersion;
-import org.apache.ambari.server.state.DeployState;
+import org.apache.ambari.server.state.State;
 import org.apache.ambari.server.state.HostState;
 import org.apache.ambari.server.state.StackVersion;
-import org.apache.ambari.server.state.State;
 import org.apache.ambari.server.state.fsm.InvalidStateTransitonException;
 import org.apache.ambari.server.state.live.host.HostHealthyHeartbeatEvent;
 import org.apache.ambari.server.state.live.host.HostRegistrationRequestEvent;

ambari-server/src/test/java/org/apache/ambari/server/state/live/svccomphost/TestServiceComponentHostImpl.java

@@ -18,9 +18,16 @@
 
 package org.apache.ambari.server.state.live.svccomphost;
 
-import org.apache.ambari.server.state.DeployState;
+import static org.mockito.Mockito.*;
+
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.State;
+import org.apache.ambari.server.state.Service;
+import org.apache.ambari.server.state.ServiceComponent;
 import org.apache.ambari.server.state.ServiceComponentHostEvent;
 import org.apache.ambari.server.state.ServiceComponentHostEventType;
+import org.apache.ambari.server.state.ServiceComponentImpl;
+import org.apache.ambari.server.state.ServiceImpl;
 import org.apache.ambari.server.state.live.svccomphost.ServiceComponentHostImpl;
 import org.apache.ambari.server.state.live.svccomphost.ServiceComponentHostOpFailedEvent;
 import org.apache.ambari.server.state.live.svccomphost.ServiceComponentHostOpInProgressEvent;
@@ -35,10 +42,13 @@ public class TestServiceComponentHostImpl {
       String svc,
       String svcComponent,
       String hostName, boolean isClient) {
-    ServiceComponentHostImpl impl = new ServiceComponentHostImpl(clusterId, svc,
-        svcComponent, hostName, isClient);
-    Assert.assertEquals(DeployState.INIT,
-        impl.getState().getLiveState());
+    Cluster c = mock(Cluster.class);
+    Service s = new ServiceImpl(c, svc);
+    ServiceComponent sc = new ServiceComponentImpl(s, svcComponent);
+    ServiceComponentHostImpl impl = new ServiceComponentHostImpl(
+        sc, hostName, isClient);
+    Assert.assertEquals(State.INIT,
+        impl.getState());
     return impl;
   }
 
@@ -84,15 +94,15 @@ public class TestServiceComponentHostImpl {
 
   private void runStateChanges(ServiceComponentHostImpl impl,
       ServiceComponentHostEventType startEvent,
-      DeployState startState,
-      DeployState inProgressState,
-      DeployState failedState,
-      DeployState completedState)
+      State startState,
+      State inProgressState,
+      State failedState,
+      State completedState)
     throws Exception {
     long timestamp = 0;
 
     Assert.assertEquals(startState,
-        impl.getState().getLiveState());
+        impl.getState());
     ServiceComponentHostEvent installEvent = createEvent(impl, ++timestamp,
         startEvent);
 
@@ -102,7 +112,7 @@ public class TestServiceComponentHostImpl {
     Assert.assertEquals(-1, impl.getLastOpLastUpdateTime());
     Assert.assertEquals(-1, impl.getLastOpEndTime());
     Assert.assertEquals(inProgressState,
-        impl.getState().getLiveState());
+        impl.getState());
 
     ServiceComponentHostEvent installEvent2 = createEvent(impl, ++timestamp,
         startEvent);
@@ -117,7 +127,7 @@ public class TestServiceComponentHostImpl {
     Assert.assertEquals(-1, impl.getLastOpLastUpdateTime());
     Assert.assertEquals(-1, impl.getLastOpEndTime());
     Assert.assertEquals(inProgressState,
-        impl.getState().getLiveState());
+        impl.getState());
 
     ServiceComponentHostOpInProgressEvent inProgressEvent1 = new
         ServiceComponentHostOpInProgressEvent(impl.getServiceComponentName(),
@@ -127,7 +137,7 @@ public class TestServiceComponentHostImpl {
     Assert.assertEquals(timestamp, impl.getLastOpLastUpdateTime());
     Assert.assertEquals(-1, impl.getLastOpEndTime());
     Assert.assertEquals(inProgressState,
-        impl.getState().getLiveState());
+        impl.getState());
 
     ServiceComponentHostOpInProgressEvent inProgressEvent2 = new
         ServiceComponentHostOpInProgressEvent(impl.getServiceComponentName(),
@@ -137,7 +147,7 @@ public class TestServiceComponentHostImpl {
     Assert.assertEquals(timestamp, impl.getLastOpLastUpdateTime());
     Assert.assertEquals(-1, impl.getLastOpEndTime());
     Assert.assertEquals(inProgressState,
-        impl.getState().getLiveState());
+        impl.getState());
 
 
     ServiceComponentHostOpFailedEvent failEvent = new
@@ -149,7 +159,7 @@ public class TestServiceComponentHostImpl {
     Assert.assertEquals(timestamp, impl.getLastOpLastUpdateTime());
     Assert.assertEquals(endTime, impl.getLastOpEndTime());
     Assert.assertEquals(failedState,
-        impl.getState().getLiveState());
+        impl.getState());
 
     ServiceComponentHostOpRestartedEvent restartEvent = new
         ServiceComponentHostOpRestartedEvent(impl.getServiceComponentName(),
@@ -160,7 +170,7 @@ public class TestServiceComponentHostImpl {
     Assert.assertEquals(-1, impl.getLastOpLastUpdateTime());
     Assert.assertEquals(-1, impl.getLastOpEndTime());
     Assert.assertEquals(inProgressState,
-        impl.getState().getLiveState());
+        impl.getState());
 
     ServiceComponentHostOpInProgressEvent inProgressEvent3 = new
         ServiceComponentHostOpInProgressEvent(impl.getServiceComponentName(),
@@ -170,7 +180,7 @@ public class TestServiceComponentHostImpl {
     Assert.assertEquals(timestamp, impl.getLastOpLastUpdateTime());
     Assert.assertEquals(-1, impl.getLastOpEndTime());
     Assert.assertEquals(inProgressState,
-        impl.getState().getLiveState());
+        impl.getState());
 
     ServiceComponentHostOpSucceededEvent succeededEvent = new
         ServiceComponentHostOpSucceededEvent(impl.getServiceComponentName(),
@@ -181,7 +191,7 @@ public class TestServiceComponentHostImpl {
     Assert.assertEquals(timestamp, impl.getLastOpLastUpdateTime());
     Assert.assertEquals(endTime, impl.getLastOpEndTime());
     Assert.assertEquals(completedState,
-        impl.getState().getLiveState());
+        impl.getState());
 
   }
 
@@ -191,18 +201,18 @@ public class TestServiceComponentHostImpl {
         "svcComp", "h1", true);
 
     runStateChanges(impl, ServiceComponentHostEventType.HOST_SVCCOMP_INSTALL,
-        DeployState.INIT,
-        DeployState.INSTALLING,
-        DeployState.INSTALL_FAILED,
-        DeployState.INSTALLED);
+        State.INIT,
+        State.INSTALLING,
+        State.INSTALL_FAILED,
+        State.INSTALLED);
 
     boolean exceptionThrown = false;
     try {
       runStateChanges(impl, ServiceComponentHostEventType.HOST_SVCCOMP_START,
-        DeployState.INSTALLED,
-        DeployState.STARTING,
-        DeployState.START_FAILED,
-        DeployState.STARTED);
+        State.INSTALLED,
+        State.STARTING,
+        State.START_FAILED,
+        State.STARTED);
     }
     catch (Exception e) {
       exceptionThrown = true;
@@ -210,16 +220,16 @@ public class TestServiceComponentHostImpl {
     Assert.assertTrue("Exception not thrown on invalid event", exceptionThrown);
 
     runStateChanges(impl, ServiceComponentHostEventType.HOST_SVCCOMP_UNINSTALL,
-        DeployState.INSTALLED,
-        DeployState.UNINSTALLING,
-        DeployState.UNINSTALL_FAILED,
-        DeployState.UNINSTALLED);
+        State.INSTALLED,
+        State.UNINSTALLING,
+        State.UNINSTALL_FAILED,
+        State.UNINSTALLED);
 
     runStateChanges(impl, ServiceComponentHostEventType.HOST_SVCCOMP_WIPEOUT,
-        DeployState.UNINSTALLED,
-        DeployState.WIPING_OUT,
-        DeployState.WIPEOUT_FAILED,
-        DeployState.INIT);
+        State.UNINSTALLED,
+        State.WIPING_OUT,
+        State.WIPEOUT_FAILED,
+        State.INIT);
 
   }
 
@@ -229,34 +239,34 @@ public class TestServiceComponentHostImpl {
         "svcComp", "h1", false);
 
     runStateChanges(impl, ServiceComponentHostEventType.HOST_SVCCOMP_INSTALL,
-        DeployState.INIT,
-        DeployState.INSTALLING,
-        DeployState.INSTALL_FAILED,
-        DeployState.INSTALLED);
+        State.INIT,
+        State.INSTALLING,
+        State.INSTALL_FAILED,
+        State.INSTALLED);
 
     runStateChanges(impl, ServiceComponentHostEventType.HOST_SVCCOMP_START,
-      DeployState.INSTALLED,
-      DeployState.STARTING,
-      DeployState.START_FAILED,
-      DeployState.STARTED);
+      State.INSTALLED,
+      State.STARTING,
+      State.START_FAILED,
+      State.STARTED);
 
     runStateChanges(impl, ServiceComponentHostEventType.HOST_SVCCOMP_STOP,
-      DeployState.STARTED,
-      DeployState.STOPPING,
-      DeployState.STOP_FAILED,
-      DeployState.INSTALLED);
+      State.STARTED,
+      State.STOPPING,
+      State.STOP_FAILED,
+      State.INSTALLED);
 
     runStateChanges(impl, ServiceComponentHostEventType.HOST_SVCCOMP_UNINSTALL,
-        DeployState.INSTALLED,
-        DeployState.UNINSTALLING,
-        DeployState.UNINSTALL_FAILED,
-        DeployState.UNINSTALLED);
+        State.INSTALLED,
+        State.UNINSTALLING,
+        State.UNINSTALL_FAILED,
+        State.UNINSTALLED);
 
     runStateChanges(impl, ServiceComponentHostEventType.HOST_SVCCOMP_WIPEOUT,
-        DeployState.UNINSTALLED,
-        DeployState.WIPING_OUT,
-        DeployState.WIPEOUT_FAILED,
-        DeployState.INIT);
+        State.UNINSTALLED,
+        State.WIPING_OUT,
+        State.WIPEOUT_FAILED,
+        State.INIT);
 
   }