[13/50] [abbrv] ambari git commit: AMBARI-22226. RU: Downgrade is failed ZKFC (ncole)

2017-10-19 Thread aonishuk 
AMBARI-6. 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/branch-3.0-perf
Commit: 20faae7a3647943b61e46f41ce27da81e91dc519
Parents: 3a0d168
Author: Nate Cole 
Authored: Fri Oct 13 08:42:12 2017 -0400
Committer: Nate Cole 
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 errors = new TreeSet<>();
 
 Cluster cluster = upgradeContext.getCluster();
-RepositoryVersionEntity repositoryVersionEntity = 
upgradeContext.getRepositoryVersion();
-StackId targetStackId = repositoryVersionEntity.getStackId();
-
 Set 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(),

[26/50] ambari git commit: AMBARI-22226. RU: Downgrade is failed ZKFC (ncole)

2017-10-17 Thread amagyar 
AMBARI-6. 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/branch-feature-AMBARI-22008
Commit: 20faae7a3647943b61e46f41ce27da81e91dc519
Parents: 3a0d168
Author: Nate Cole 
Authored: Fri Oct 13 08:42:12 2017 -0400
Committer: Nate Cole 
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 errors = new TreeSet<>();
 
 Cluster cluster = upgradeContext.getCluster();
-RepositoryVersionEntity repositoryVersionEntity = 
upgradeContext.getRepositoryVersion();
-StackId targetStackId = repositoryVersionEntity.getStackId();
-
 Set 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(),

[05/33] ambari git commit: AMBARI-22226. RU: Downgrade is failed ZKFC (ncole)

2017-10-13 Thread lpuskas 
AMBARI-6. 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 
Authored: Fri Oct 13 08:42:12 2017 -0400
Committer: Nate Cole 
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 errors = new TreeSet<>();
 
 Cluster cluster = upgradeContext.getCluster();
-RepositoryVersionEntity repositoryVersionEntity = 
upgradeContext.getRepositoryVersion();
-StackId targetStackId = repositoryVersionEntity.getStackId();
-
 Set 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(),

[49/50] [abbrv] ambari git commit: AMBARI-22226. RU: Downgrade is failed ZKFC (ncole)

2017-10-13 Thread rlevas 
AMBARI-6. 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/branch-feature-AMBARI-20859
Commit: 20faae7a3647943b61e46f41ce27da81e91dc519
Parents: 3a0d168
Author: Nate Cole 
Authored: Fri Oct 13 08:42:12 2017 -0400
Committer: Nate Cole 
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 errors = new TreeSet<>();
 
 Cluster cluster = upgradeContext.getCluster();
-RepositoryVersionEntity repositoryVersionEntity = 
upgradeContext.getRepositoryVersion();
-StackId targetStackId = repositoryVersionEntity.getStackId();
-
 Set 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(),

ambari git commit: AMBARI-22226. RU: Downgrade is failed ZKFC (ncole)

2017-10-13 Thread ncole 
Repository: ambari
Updated Branches:
  refs/heads/trunk 3a0d168c0 -> 20faae7a3


AMBARI-6. 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/trunk
Commit: 20faae7a3647943b61e46f41ce27da81e91dc519
Parents: 3a0d168
Author: Nate Cole 
Authored: Fri Oct 13 08:42:12 2017 -0400
Committer: Nate Cole 
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 errors = new TreeSet<>();
 
 Cluster cluster = upgradeContext.getCluster();
-RepositoryVersionEntity repositoryVersionEntity = 
upgradeContext.getRepositoryVersion();
-StackId targetStackId = repositoryVersionEntity.getStackId();
-
 Set 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(),

ambari git commit: AMBARI-22226. RU: Downgrade is failed ZKFC (ncole)

2017-10-13 Thread ncole 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 faef3a22e -> de2145908


AMBARI-6. 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/de214590
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/de214590
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/de214590

Branch: refs/heads/branch-2.6
Commit: de2145908647d05f83eb0869f042feb42868b1cd
Parents: faef3a2
Author: Nate Cole 
Authored: Thu Oct 12 16:26:33 2017 -0400
Committer: Nate Cole 
Committed: Fri Oct 13 08:07:35 2017 -0400

--
 .../serveraction/ServerActionExecutor.java  |  3 +--
 .../upgrades/FinalizeUpgradeAction.java | 21 ++--
 2 files changed, 11 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/de214590/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
index f80d06a..50e3cfe 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
@@ -18,7 +18,6 @@
 
 package org.apache.ambari.server.serveraction;
 
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -84,7 +83,7 @@ public class ServerActionExecutor {
* requestSharedDataMap object
*/
   private final Map> requestSharedDataMap =
-  new HashMap<>();
+  new ConcurrentHashMap<>();
 
   /**
* Database accessor to query and update the database of action commands.

http://git-wip-us.apache.org/repos/asf/ambari/blob/de214590/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 0ce5d30..4d5f3ba 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
@@ -267,7 +267,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());
@@ -363,23 +363,22 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 Set errors = new TreeSet<>();
 
 Cluster cluster = upgradeContext.getCluster();
-RepositoryVersionEntity repositoryVersionEntity = 
upgradeContext.getRepositoryVersion();
-StackId targetStackId = repositoryVersionEntity.getStackId();
-
 Set 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()) {
+