commit 271695c03bb5ca03a5f1801dd39752da25879cfd
author aonishuk <aonishuk@hortonworks.com> Wed Sep 23 17:09:30 2020 +0300
committer GitHub <noreply@github.com> Wed Sep 23 17:09:30 2020 +0300
tree dd94ab5a0171794bbc64c176c1f9a04700e24e0a
parent 3c9904252ab0939cbe09e044ca127d1d2a791fe8

Revert "AMBARI-25558. Upgrade fails because host is out of sync (#3227)"

This reverts commit 36e5735bfa84efe8b34e7f509e5deef2f3bddd4b.

ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
index 48083e2..4b3e42a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
@@ -137,14 +137,8 @@
               hostStackId.getStackName(), hostStackId.getStackVersion(), serviceName, componentName);
           continue;
         }
-
-        ComponentInfo component = ami.get().getService(hostStackId.getStackName(), hostStackId.getStackVersion(),
-                                                        serviceName).getComponentByName(componentName);
-
-        // Skip lookup if stack does not contain the component
-        if (component == null) {
-          continue;
-        }
+        ComponentInfo component = ami.get().getComponent(hostStackId.getStackName(),
+                hostStackId.getStackVersion(), serviceName, componentName);
 
         if (!component.isVersionAdvertised()) {
           RepositoryVersionState state = checkAllHostComponents(hostStackId, hostVersionEntity.getHostEntity());