You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by lp...@apache.org on 2017/10/13 15:54:33 UTC
[05/33] ambari git commit: AMBARI-22226. RU: Downgrade is failed ZKFC
(ncole)
AMBARI-22226. RU: Downgrade is failed ZKFC (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/20faae7a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/20faae7a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/20faae7a
Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 20faae7a3647943b61e46f41ce27da81e91dc519
Parents: 3a0d168
Author: Nate Cole <nc...@hortonworks.com>
Authored: Fri Oct 13 08:42:12 2017 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Fri Oct 13 09:19:08 2017 -0400
----------------------------------------------------------------------
.../upgrades/FinalizeUpgradeAction.java | 21 ++++++++++----------
1 file changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/20faae7a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index d6876d9..87ea1fc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -271,7 +271,7 @@ public class FinalizeUpgradeAction extends AbstractUpgradeServerAction {
errors.size())).append(System.lineSeparator());
for (InfoTuple error : errors) {
- messageBuff.append(String.format("%s: $s (current = %s, desired = %s ", error.hostName,
+ messageBuff.append(String.format("%s: %s (current = %s, desired = %s)", error.hostName,
error.componentName, error.currentVersion, error.targetVersion));
messageBuff.append(System.lineSeparator());
@@ -367,23 +367,22 @@ public class FinalizeUpgradeAction extends AbstractUpgradeServerAction {
Set<InfoTuple> errors = new TreeSet<>();
Cluster cluster = upgradeContext.getCluster();
- RepositoryVersionEntity repositoryVersionEntity = upgradeContext.getRepositoryVersion();
- StackId targetStackId = repositoryVersionEntity.getStackId();
-
Set<String> servicesParticipating = upgradeContext.getSupportedServices();
for (String serviceName : servicesParticipating) {
Service service = cluster.getService(serviceName);
- String targetVersion = upgradeContext.getTargetVersion(serviceName);
+ RepositoryVersionEntity repositoryVersionEntity = upgradeContext.getTargetRepositoryVersion(serviceName);
+ StackId targetStackId = repositoryVersionEntity.getStackId();
+ String targetVersion = repositoryVersionEntity.getVersion();
for (ServiceComponent serviceComponent : service.getServiceComponents().values()) {
- for (ServiceComponentHost serviceComponentHost : serviceComponent.getServiceComponentHosts().values()) {
- ComponentInfo componentInfo = ambariMetaInfo.getComponent(targetStackId.getStackName(),
- targetStackId.getStackVersion(), service.getName(), serviceComponent.getName());
+ ComponentInfo componentInfo = ambariMetaInfo.getComponent(targetStackId.getStackName(),
+ targetStackId.getStackVersion(), service.getName(), serviceComponent.getName());
- if (!componentInfo.isVersionAdvertised()) {
- continue;
- }
+ if (!componentInfo.isVersionAdvertised()) {
+ continue;
+ }
+ for (ServiceComponentHost serviceComponentHost : serviceComponent.getServiceComponentHosts().values()) {
if (!StringUtils.equals(targetVersion, serviceComponentHost.getVersion())) {
errors.add(new InfoTuple(service.getName(), serviceComponent.getName(),
serviceComponentHost.getHostName(), serviceComponentHost.getVersion(),