AMBARI-2184. Install progress gets stuck at 33% and displays incorrect status upon refresh. (smohanty)

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

CHANGES.txt

@@ -887,6 +887,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2184. Install progress gets stuck at 33% and displays incorrect
+ status upon refresh. (smohanty)
+
  AMBARI-2159. After upgrading ambari from 1.2.2.5 to 1.2.3.6 the server
  throws 500 error when starting/stopping any service. (smohanty)
 

ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostComponentConfigMappingDAO.java

@@ -38,6 +38,11 @@ public class HostComponentConfigMappingDAO {
   @Inject
   DaoUtils daoUtils;
 
+  @Transactional
+  public void create(HostComponentConfigMappingEntity entity) {
+    entityManagerProvider.get().persist(entity);
+  }
+
   @Transactional
   public List<HostComponentConfigMappingEntity> findByType(
       Collection<String> configTypes) {

ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostComponentDesiredConfigMappingDAO.java

@@ -38,6 +38,11 @@ public class HostComponentDesiredConfigMappingDAO {
   @Inject
   DaoUtils daoUtils;
 
+  @Transactional
+  public void create(HostComponentDesiredConfigMappingEntity entity) {
+    entityManagerProvider.get().persist(entity);
+  }
+
   @Transactional
   public List<HostComponentDesiredConfigMappingEntity> findByType(
       Collection<String> configTypes) {

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

@@ -66,7 +66,7 @@ public class HostComponentDesiredStateEntity {
   @JoinColumn(name = "host_name", referencedColumnName = "host_name", nullable = false)
   private HostEntity hostEntity;
 
-  @OneToMany(mappedBy = "hostComponentDesiredStateEntity", cascade = CascadeType.ALL)
+  @OneToMany(mappedBy = "hostComponentDesiredStateEntity", cascade = {CascadeType.REMOVE, CascadeType.REFRESH})
   private Collection<HostComponentDesiredConfigMappingEntity> desiredConfigMappingEntities;
 
   public Long getClusterId() {

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

@@ -66,7 +66,7 @@ public class HostComponentStateEntity {
   @JoinColumn(name = "host_name", referencedColumnName = "host_name", nullable = false)
   private HostEntity hostEntity;
 
-  @OneToMany(mappedBy = "hostComponentStateEntity", cascade = CascadeType.ALL)
+  @OneToMany(mappedBy = "hostComponentStateEntity", cascade = {CascadeType.REMOVE, CascadeType.REFRESH})
   private Collection<HostComponentConfigMappingEntity> configMappingEntities;
 
   public Long getClusterId() {

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

@@ -908,6 +908,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
             contains = true;
             mappingEntity.setVersionTag(entry.getValue());
             mappingEntity.setTimestamp(now);
+            hostComponentConfigMappingDAO.merge(mappingEntity);
             break;
           }
         }
@@ -934,7 +935,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
           }
           stateEntity.getHostComponentConfigMappingEntities().add(newEntity);
           newEntity.setHostComponentStateEntity(stateEntity);
-
+          hostComponentConfigMappingDAO.create(newEntity);
         }
       }
 
@@ -1077,6 +1078,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
             contains = true;
             desiredConfigMappingEntity.setVersionTag(entry.getValue().getVersionTag());
             desiredConfigMappingEntity.setTimestamp(new Date().getTime());
+            hostComponentDesiredConfigMappingDAO.merge(desiredConfigMappingEntity);
             break;
           }
         }
@@ -1092,6 +1094,7 @@ public class ServiceComponentHostImpl implements ServiceComponentHost {
           newEntity.setTimestamp(new Date().getTime());
           newEntity.setHostComponentDesiredStateEntity(desiredStateEntity);
           desiredStateEntity.getHostComponentDesiredConfigMappingEntities().add(newEntity);
+          hostComponentDesiredConfigMappingDAO.create(newEntity);
         }
 
         this.desiredConfigs.put(entry.getKey(), entry.getValue().getVersionTag());