AMBARI-1564. TestActionManager is failing on master branch. (swagle)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1453512 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -421,6 +421,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1564. TestActionManager is failing on master branch. (swagle)
+
  AMBARI-1561. API should return nagios_alerts as a JSON, not a 
  stringified JSON. (swagle)
 

ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostRoleCommandEntity.java

@@ -257,7 +257,7 @@ public class HostRoleCommandEntity {
 
   private StageEntity stage;
 
-  @ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
+  @ManyToOne(cascade = {CascadeType.MERGE})
   @JoinColumns({@JoinColumn(name = "request_id", referencedColumnName = "request_id", nullable = false), @JoinColumn(name = "stage_id", referencedColumnName = "stage_id", nullable = false)})
   public StageEntity getStage() {
     return stage;

ambari-server/src/main/java/org/apache/ambari/server/orm/entities/StageEntity.java

@@ -99,7 +99,7 @@ public class StageEntity {
 
   private ClusterEntity cluster;
 
-  @ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
+  @ManyToOne(cascade = {CascadeType.MERGE})
   @JoinColumn(name = "cluster_id", referencedColumnName = "cluster_id")
   public ClusterEntity getCluster() {
     return cluster;

ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java

@@ -153,7 +153,6 @@ public class ClusterImpl implements Cluster {
     if (svcHostsLoaded) return;
     writeLock.lock();
     try {
-      if (svcHostsLoaded) return;
       LOG.info("Loading Service Host Components");
       if (svcHostsLoaded) return;
       if (services != null) {
@@ -695,6 +694,7 @@ public class ClusterImpl implements Cluster {
   public void delete() throws AmbariException {
     readWriteLock.writeLock().lock();
     try {
+      refresh();
       deleteAllServices();
       removeEntities();
       allConfigs.clear();