AMBARI-21002. RU/EU: Restart Zookeeper step failed (dgrinenko via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/48c9b340 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/48c9b340 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/48c9b340 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 48c9b3402610614603ae9aefa034a08a9a90c75b Parents: 08dd15b Author: Lisnichenko Dmitro <[email protected]> Authored: Fri May 12 16:53:07 2017 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Fri May 12 16:53:56 2017 +0300 ---------------------------------------------------------------------- .../server/controller/internal/UpgradeResourceProvider.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/48c9b340/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java index 623851a..c7f7980 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java @@ -120,6 +120,7 @@ import org.apache.ambari.server.state.stack.upgrade.UpdateStackGrouping; import org.apache.ambari.server.state.stack.upgrade.UpgradeScope; import org.apache.ambari.server.state.stack.upgrade.UpgradeType; import org.apache.ambari.server.state.svccomphost.ServiceComponentHostServerActionEvent; +import org.apache.ambari.server.utils.StageUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -818,7 +819,7 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider } List<UpgradeGroupEntity> groupEntities = new ArrayList<>(); - RequestStageContainer req = createRequest(direction, version); + RequestStageContainer req = createRequest(cluster, direction, version); // the upgrade context calculated these for us based on direction StackId sourceStackId = upgradeContext.getOriginalStackId(); @@ -1264,13 +1265,17 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider } } - private RequestStageContainer createRequest(Direction direction, String version) { + private RequestStageContainer createRequest(Cluster cluster, Direction direction, String version) throws AmbariException { ActionManager actionManager = getManagementController().getActionManager(); RequestStageContainer requestStages = new RequestStageContainer( actionManager.getNextRequestId(), null, s_requestFactory.get(), actionManager); requestStages.setRequestContext(String.format("%s to %s", direction.getVerb(true), version)); + Map<String, Set<String>> clusterHostInfo = StageUtils.getClusterHostInfo(cluster); + String clusterHostInfoJson = StageUtils.getGson().toJson(clusterHostInfo); + requestStages.setClusterHostInfo(clusterHostInfoJson); + return requestStages; }
