You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/05/30 18:29:38 UTC
[16/50] [abbrv] ambari git commit: Revert "AMBARI-21002. RU/EU:
Restart Zookeeper step failed (dgrinenko via dlysnichenko)"
Revert "AMBARI-21002. RU/EU: Restart Zookeeper step failed (dgrinenko via dlysnichenko)"
This reverts commit 48c9b3402610614603ae9aefa034a08a9a90c75b.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8f9786ba
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8f9786ba
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8f9786ba
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 8f9786ba77670276d78d76b6a5d7dc2029a67a29
Parents: 48c9b34
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri May 12 16:56:34 2017 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri May 12 16:56:34 2017 +0300
----------------------------------------------------------------------
.../server/controller/internal/UpgradeResourceProvider.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8f9786ba/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 c7f7980..623851a 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,7 +120,6 @@ 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;
@@ -819,7 +818,7 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
}
List<UpgradeGroupEntity> groupEntities = new ArrayList<>();
- RequestStageContainer req = createRequest(cluster, direction, version);
+ RequestStageContainer req = createRequest(direction, version);
// the upgrade context calculated these for us based on direction
StackId sourceStackId = upgradeContext.getOriginalStackId();
@@ -1265,17 +1264,13 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
}
}
- private RequestStageContainer createRequest(Cluster cluster, Direction direction, String version) throws AmbariException {
+ private RequestStageContainer createRequest(Direction direction, String version) {
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;
}