You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/11/01 20:51:58 UTC
[1/2] git commit: AMBARI-8097. Upgrade to 1.7.0 shows exception in
log related to WEBHCAT (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 d2c515945 -> 3a2cd15d8
refs/heads/trunk 7ee4aed1f -> 5eb44e362
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/5eb44e36
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5eb44e36
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5eb44e36
Branch: refs/heads/trunk
Commit: 5eb44e3625bc219c80cd852bb6ed2388285fbb4c
Parents: 7ee4aed
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Sat Nov 1 21:51:35 2014 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Sat Nov 1 21:51:35 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/5eb44e36/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
[2/2] git commit: AMBARI-8097. Upgrade to 1.7.0 shows exception in
log related to WEBHCAT (aonishuk)
Posted by ao...@apache.org.
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 <ao...@hortonworks.com>
Authored: Sat Nov 1 21:51:39 2014 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
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