http://git-wip-us.apache.org/repos/asf/ambari/blob/70c23bcd/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java ----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/70c23bcd/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/70c23bcd/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java ---------------------------------------------------------------------- diff --cc ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java index b3755de,086055d..32d6151 --- 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 @@@ -455,17 -482,9 +455,17 @@@ public class FinalizeUpgradeAction exte protected List<InfoTuple> checkHostComponentVersions(Cluster cluster, String desiredVersion, StackId targetStackId) throws AmbariException { - ArrayList<InfoTuple> errors = new ArrayList<InfoTuple>(); + ArrayList<InfoTuple> errors = new ArrayList<>(); + Set<String> supportedServices = getSupportedServices(); + for (Service service : cluster.getServices().values()) { + + // !!! if there are supported services for upgrade, and the cluster service is NOT in the list, skip + if (!supportedServices.isEmpty() && !supportedServices.contains(service.getName())) { + continue; + } + for (ServiceComponent serviceComponent : service.getServiceComponents().values()) { for (ServiceComponentHost serviceComponentHost : serviceComponent.getServiceComponentHosts().values()) { ComponentInfo componentInfo = ambariMetaInfo.getComponent(targetStackId.getStackName(), http://git-wip-us.apache.org/repos/asf/ambari/blob/70c23bcd/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/70c23bcd/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/70c23bcd/ambari-server/src/test/java/org/apache/ambari/server/checks/AbstractCheckDescriptorTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/70c23bcd/ambari-server/src/test/java/org/apache/ambari/server/checks/MapReduce2JobHistoryStatePreservingCheckTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/70c23bcd/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheckTest.java ---------------------------------------------------------------------- diff --cc ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheckTest.java index a2bd1a6,7d1f907..df1aa37 --- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheckTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheckTest.java @@@ -53,8 -50,7 +53,9 @@@ public class ServicesNamenodeTruncateCh private Clusters m_clusters = EasyMock.createMock(Clusters.class); private ServicesNamenodeTruncateCheck m_check = new ServicesNamenodeTruncateCheck(); + private final Map<String, String> m_configMap = new HashMap<String, String>(); + private RepositoryVersionDAO m_repositoryVersionDAO = EasyMock.createMock(RepositoryVersionDAO.class); + private final Map<String, String> m_configMap = new HashMap<>(); @Before public void setup() throws Exception { http://git-wip-us.apache.org/repos/asf/ambari/blob/70c23bcd/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/70c23bcd/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/70c23bcd/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/70c23bcd/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java ----------------------------------------------------------------------