AMBARI-9498. RU: hosts master check is not checking all masters (yshylov via dlysnichenko)

ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java

@@ -19,15 +19,16 @@ package org.apache.ambari.server.checks;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
+
 import org.apache.ambari.server.AmbariException;
-import org.apache.ambari.server.configuration.Configuration;
+import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.controller.PrereqCheckRequest;
 import org.apache.ambari.server.orm.dao.HostVersionDAO;
 import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
 import org.apache.ambari.server.state.Clusters;
-import org.apache.ambari.server.state.ConfigHelper;
 import org.apache.ambari.server.state.stack.PrerequisiteCheck;
 import org.apache.ambari.server.state.stack.PrereqCheckType;
+import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper;
 
 /**
  * Describes prerequisite check.
@@ -41,15 +42,18 @@ public abstract class AbstractCheckDescriptor {
   @Inject
   Provider<Clusters> clustersProvider;
 
-  @Inject
-  Provider<ConfigHelper> configHelperProvider;
-
   @Inject
   Provider<HostVersionDAO> hostVersionDaoProvider;
 
   @Inject
   Provider<RepositoryVersionDAO> repositoryVersionDaoProvider;
 
+  @Inject
+  Provider<RepositoryVersionHelper> repositoryVersionHelper;
+
+  @Inject
+  Provider<AmbariMetaInfo> ambariMetaInfo;
+
   /**
    * Constructor.
    *

ambari-server/src/main/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheck.java

@@ -19,12 +19,12 @@ package org.apache.ambari.server.checks;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.controller.PrereqCheckRequest;
-import org.apache.ambari.server.stack.HostsType;
-import org.apache.ambari.server.stack.MasterHostResolver;
 import org.apache.ambari.server.state.*;
 import org.apache.ambari.server.state.stack.PrereqCheckStatus;
 import org.apache.ambari.server.state.stack.PrerequisiteCheck;
 import org.apache.ambari.server.state.stack.PrereqCheckType;
+import org.apache.ambari.server.state.stack.UpgradePack;
+import org.apache.ambari.server.state.stack.UpgradePack.ProcessingComponent;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -42,19 +42,37 @@ public class HostsMasterMaintenanceCheck extends AbstractCheckDescriptor {
     super("HOSTS_MASTER_MAINTENANCE", PrereqCheckType.HOST, "Hosts in Maintenance Mode must not have any master components");
   }
 
+  @Override
+  public boolean isApplicable(PrereqCheckRequest request) throws AmbariException {
+    return request.getRepositoryVersion() != null;
+  }
+
   @Override
   public void perform(PrerequisiteCheck prerequisiteCheck, PrereqCheckRequest request) throws AmbariException {
     final String clusterName = request.getClusterName();
     final Cluster cluster = clustersProvider.get().getCluster(clusterName);
-    final MasterHostResolver masterHostResolver = new MasterHostResolver(configHelperProvider.get(), cluster);
+    final StackId stackId = cluster.getDesiredStackVersion();
     final Set<String> hostsWithMasterComponent = new HashSet<String>();
-    for (Map.Entry<String, Service> serviceEntry: cluster.getServices().entrySet()) {
-      final Service service = serviceEntry.getValue();
-      for (Map.Entry<String, ServiceComponent> serviceComponentEntry: service.getServiceComponents().entrySet()) {
-        final ServiceComponent serviceComponent = serviceComponentEntry.getValue();
-        final HostsType hostsType = masterHostResolver.getMasterAndHosts(service.getName(), serviceComponent.getName());
-        if (hostsType != null && hostsType.master != null) {
-          hostsWithMasterComponent.add(hostsType.master);
+    final String upgradePackName = repositoryVersionHelper.get().getUpgradePackageName(stackId.getStackName(), stackId.getStackVersion(), request.getRepositoryVersion());
+    if (upgradePackName == null) {
+      prerequisiteCheck.setStatus(PrereqCheckStatus.FAIL);
+      prerequisiteCheck.setFailReason("Could not find suitable upgrade pack for " + stackId.getStackName() + " " + stackId.getStackVersion() + " to version " + request.getRepositoryVersion());
+      return;
+    }
+    final UpgradePack upgradePack = ambariMetaInfo.get().getUpgradePacks(stackId.getStackName(), stackId.getStackVersion()).get(upgradePackName);
+    if (upgradePack == null) {
+      prerequisiteCheck.setStatus(PrereqCheckStatus.FAIL);
+      prerequisiteCheck.setFailReason("Could not find upgrade pack named " + upgradePackName);
+      return;
+    }
+    final Set<String> componentsFromUpgradePack = new HashSet<String>();
+    for (Map<String, ProcessingComponent> task: upgradePack.getTasks().values()) {
+      componentsFromUpgradePack.addAll(task.keySet());
+    }
+    for (Service service: cluster.getServices().values()) {
+      for (ServiceComponent serviceComponent: service.getServiceComponents().values()) {
+        if (serviceComponent.isMasterComponent() && componentsFromUpgradePack.contains(serviceComponent.getName())) {
+          hostsWithMasterComponent.addAll(serviceComponent.getServiceComponentHosts().keySet());
         }
       }
     }

ambari-server/src/test/java/org/apache/ambari/server/state/CheckHelperTest.java

@@ -21,28 +21,30 @@ package org.apache.ambari.server.state;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.util.Providers;
 import junit.framework.Assert;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.ClusterNotFoundException;
+import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.checks.AbstractCheckDescriptor;
 import org.apache.ambari.server.checks.ServicesUpCheck;
-import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.PrereqCheckRequest;
 import org.apache.ambari.server.orm.dao.HostVersionDAO;
 import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
-import org.apache.ambari.server.state.stack.PrerequisiteCheck;
 import org.apache.ambari.server.state.stack.PrereqCheckStatus;
+import org.apache.ambari.server.state.stack.PrerequisiteCheck;
+import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper;
 import org.easymock.EasyMock;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.util.Providers;
+
 
 /**
  * Tests the {@link CheckHelper} class
@@ -115,9 +117,10 @@ public class CheckHelperTest {
       @Override
       protected void configure() {
         bind(Clusters.class).toInstance(clusters);
-        bind(ConfigHelper.class).toProvider(Providers.<ConfigHelper>of(null));
         bind(HostVersionDAO.class).toProvider(Providers.<HostVersionDAO>of(null));
         bind(RepositoryVersionDAO.class).toProvider(Providers.<RepositoryVersionDAO>of(null));
+        bind(RepositoryVersionHelper.class).toProvider(Providers.<RepositoryVersionHelper>of(null));
+        bind(AmbariMetaInfo.class).toProvider(Providers.<AmbariMetaInfo>of(null));
       }
     });
     final CheckHelper helper = injector.getInstance(CheckHelper.class);