Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B5EF6200BA5 for ; Wed, 19 Oct 2016 18:47:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B0953160B07; Wed, 19 Oct 2016 16:47:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 023A6160ADC for ; Wed, 19 Oct 2016 18:47:12 +0200 (CEST) Received: (qmail 19666 invoked by uid 500); 19 Oct 2016 16:47:12 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 19648 invoked by uid 99); 19 Oct 2016 16:47:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Oct 2016 16:47:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1AE2BE0556; Wed, 19 Oct 2016 16:47:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Wed, 19 Oct 2016 16:47:12 -0000 Message-Id: <8b2bc32f218d4cfda988b04b82f576f4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/50] [abbrv] ambari git commit: AMBARI-18594 - AMBARI-18051 Breaks Stack Upgrade Checks archived-at: Wed, 19 Oct 2016 16:47:13 -0000 Repository: ambari Updated Branches: refs/heads/branch-dev-patch-upgrade 1cc090d56 -> a3d7aec0b AMBARI-18594 - AMBARI-18051 Breaks Stack Upgrade Checks Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/10c7595a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/10c7595a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/10c7595a Branch: refs/heads/branch-dev-patch-upgrade Commit: 10c7595a4ac858ac5a095f2caf8770f1ea685c1c Parents: 9b0f631 Author: Tim Thorpe Authored: Fri Oct 14 08:39:17 2016 -0700 Committer: Tim Thorpe Committed: Fri Oct 14 08:39:17 2016 -0700 ---------------------------------------------------------------------- .../controller/internal/PreUpgradeCheckResourceProvider.java | 7 ++++++- .../internal/PreUpgradeCheckResourceProviderTest.java | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/10c7595a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java index 7e54f83..adbd7cb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.Set; import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.ParentObjectNotFoundException; import org.apache.ambari.server.StaticallyInject; import org.apache.ambari.server.checks.AbstractCheckDescriptor; import org.apache.ambari.server.checks.UpgradeCheckRegistry; @@ -195,11 +196,15 @@ public class PreUpgradeCheckResourceProvider extends ReadOnlyResourceProvider { try { // Register all the custom prechecks from the services - Map services = getManagementController().getAmbariMetaInfo().getServices(stackName, upgradePack.getTarget()); + Map services = getManagementController().getAmbariMetaInfo().getServices(stackName, sourceStackVersion); List serviceLevelUpgradeChecksToRun = upgradeCheckRegistry.getServiceLevelUpgradeChecks(upgradePack, services); upgradeChecksToRun.addAll(serviceLevelUpgradeChecksToRun); + } catch (ParentObjectNotFoundException parentNotFoundException) { + LOG.error("Invalid stack version: " + stackName + "-" + sourceStackVersion, parentNotFoundException); } catch (AmbariException ambariException) { LOG.error("Unable to register all the custom prechecks from the services", ambariException); + } catch (Exception e) { + LOG.error("Failed to register custom prechecks for the services", e); } for (PrerequisiteCheck prerequisiteCheck : checkHelper.performChecks(upgradeCheckRequest, upgradeChecksToRun)) { http://git-wip-us.apache.org/repos/asf/ambari/blob/10c7595a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProviderTest.java index 6a0fa12..2f30215 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProviderTest.java @@ -147,9 +147,9 @@ public class PreUpgradeCheckResourceProviderTest { prerequisiteChecks.add("org.apache.ambari.server.sample.checks.SampleServiceCheck"); expect(upgradePack.getPrerequisiteCheckConfig()).andReturn(config); expect(upgradePack.getPrerequisiteChecks()).andReturn(prerequisiteChecks).anyTimes(); - expect(upgradePack.getTarget()).andReturn("1.1").anyTimes(); + expect(upgradePack.getTarget()).andReturn("1.1.*.*").anyTimes(); - expect(ambariMetaInfo.getServices("Stack100", "1.1")).andReturn(allServiceInfoMap).anyTimes(); + expect(ambariMetaInfo.getServices("Stack100", "1.0")).andReturn(allServiceInfoMap).anyTimes(); String checks = ClassLoader.getSystemClassLoader().getResource("checks").getPath(); expect(serviceInfo.getChecksFolder()).andReturn(new File(checks));