This is an automated email from the ASF dual-hosted git repository.

aonishuk pushed a commit to branch revert-3227-AMBARI-25558-branch-2.7-10
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 271695c03bb5ca03a5f1801dd39752da25879cfd
Author: aonishuk <aonis...@hortonworks.com>
AuthorDate: Wed Sep 23 17:09:30 2020 +0300

    Revert "AMBARI-25558. Upgrade fails because host is out of sync (#3227)"
    
    This reverts commit 36e5735bfa84efe8b34e7f509e5deef2f3bddd4b.
---
 .../events/listeners/upgrade/HostVersionOutOfSyncListener.java | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

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 @@ public class HostVersionOutOfSyncListener {
               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());

Reply via email to