Prechádzať zdrojové kódy

AMBARI-10798. Cross-stack config changes not being sent to agents correctly (ncole)

Nate Cole 10 rokov pred
rodič
commit
92553bd6e0

+ 4 - 3
ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java

@@ -559,6 +559,10 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
     List<UpgradeGroupEntity> groupEntities = new ArrayList<UpgradeGroupEntity>();
     RequestStageContainer req = createRequest(direction, version);
 
+    // desired configs must be set before creating stages because the config tag names
+    // are read and set on the command for filling in later
+    processConfigurations(cluster, version, direction);
+
     for (UpgradeGroupHolder group : groups) {
       UpgradeGroupEntity groupEntity = new UpgradeGroupEntity();
       groupEntity.setName(group.name);
@@ -616,9 +620,6 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
 
     entity.setRequestId(req.getId());
 
-    // !!! in case persist() starts creating tasks right away, square away the configs
-    processConfigurations(cluster, version, direction);
-
     req.persist();
 
     s_upgradeDAO.create(entity);