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 47B6F17E28 for ; Sat, 1 Nov 2014 19:51:59 +0000 (UTC) Received: (qmail 80597 invoked by uid 500); 1 Nov 2014 19:51:59 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 80568 invoked by uid 500); 1 Nov 2014 19:51:59 -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 80559 invoked by uid 99); 1 Nov 2014 19:51:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Nov 2014 19:51:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B6DCA816657; Sat, 1 Nov 2014 19:51:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aonishuk@apache.org To: commits@ambari.apache.org Date: Sat, 01 Nov 2014 19:51:59 -0000 Message-Id: <9ce15b2943854e8798b172b630accf38@git.apache.org> In-Reply-To: <9abaeb8eb54a4305968503288f50b19b@git.apache.org> References: <9abaeb8eb54a4305968503288f50b19b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: AMBARI-8097. Upgrade to 1.7.0 shows exception in log related to WEBHCAT (aonishuk) AMBARI-8097. Upgrade to 1.7.0 shows exception in log related to WEBHCAT (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3a2cd15d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3a2cd15d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3a2cd15d Branch: refs/heads/branch-1.7.0 Commit: 3a2cd15d8c845d4bbd2a462650d79d5ed3bfcc8e Parents: d2c5159 Author: Andrew Onishuk Authored: Sat Nov 1 21:51:39 2014 +0200 Committer: Andrew Onishuk Committed: Sat Nov 1 21:51:39 2014 +0200 ---------------------------------------------------------------------- .../org/apache/ambari/server/api/util/StackExtensionHelper.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3a2cd15d/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java index 17faa18..781ea13 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java @@ -566,6 +566,11 @@ public class StackExtensionHelper { File alertsJson = new File(serviceFolder.getAbsolutePath() + File.separator + AmbariMetaInfo.SERVICE_ALERT_FILE_NAME); + + if (!metainfoFile.exists()) { + LOG.warn("Service folder " + serviceFolder.getAbsolutePath() + " doesn't contain metainfo file. Ignoring it."); + continue; + } //Reading v2 service metainfo (may contain multiple services) // Get services from metadata