Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B758610970 for ; Tue, 20 Oct 2015 10:54:38 +0000 (UTC) Received: (qmail 30785 invoked by uid 500); 20 Oct 2015 10:54:38 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 30757 invoked by uid 500); 20 Oct 2015 10:54:38 -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 30748 invoked by uid 99); 20 Oct 2015 10:54:38 -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; Tue, 20 Oct 2015 10:54:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 689B3DFBD6; Tue, 20 Oct 2015 10:54:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dsen@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-13477 Unit tests failures after merging express upgrade (dsen) Date: Tue, 20 Oct 2015 10:54:38 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/branch-2.1 69f501a45 -> 37d14e429 AMBARI-13477 Unit tests failures after merging express upgrade (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/37d14e42 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/37d14e42 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/37d14e42 Branch: refs/heads/branch-2.1 Commit: 37d14e429ccbb4486d593462822cd3137292a563 Parents: 69f501a Author: Dmytro Sen Authored: Tue Oct 20 13:54:28 2015 +0300 Committer: Dmytro Sen Committed: Tue Oct 20 13:54:28 2015 +0300 ---------------------------------------------------------------------- .../ambari/server/checks/HostsMasterMaintenanceCheck.java | 6 ++++++ .../ambari/server/checks/HostsRepositoryVersionCheck.java | 5 +++++ 2 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/37d14e42/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheck.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheck.java index 39ab39f..3126636 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheck.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsMasterMaintenanceCheck.java @@ -54,6 +54,12 @@ public class HostsMasterMaintenanceCheck extends AbstractCheckDescriptor { } @Override + public boolean isApplicable(PrereqCheckRequest request) throws AmbariException { + return super.isApplicable(request) && 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); http://git-wip-us.apache.org/repos/asf/ambari/blob/37d14e42/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheck.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheck.java index 00862ac..1d609a3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheck.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsRepositoryVersionCheck.java @@ -54,6 +54,11 @@ public class HostsRepositoryVersionCheck extends AbstractCheckDescriptor { } @Override + public boolean isApplicable(PrereqCheckRequest request) throws AmbariException { + return super.isApplicable(request) && request.getRepositoryVersion() != null; + } + + @Override public void perform(PrerequisiteCheck prerequisiteCheck, PrereqCheckRequest request) throws AmbariException { final String clusterName = request.getClusterName();