You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2015/09/04 20:43:44 UTC
ambari git commit: AMBARI-12249. Exceptions encountered in Ambari
Views are missing in ambari-server.log (Dipayan Bhowmick via srimanth)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 7bd69c92d -> 1180d02e1
AMBARI-12249. Exceptions encountered in Ambari Views are missing in ambari-server.log (Dipayan Bhowmick via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1180d02e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1180d02e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1180d02e
Branch: refs/heads/branch-2.1
Commit: 1180d02e1638f119f662f479fa5d75b9b433f186
Parents: 7bd69c9
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Fri Sep 4 11:43:05 2015 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Fri Sep 4 11:43:05 2015 -0700
----------------------------------------------------------------------
.../ambari/view/slider/SliderAppTypesResourceProvider.java | 5 +++--
.../java/org/apache/ambari/view/slider/SliderAppsAlerts.java | 5 +++--
.../org/apache/ambari/view/slider/SliderAppsConfiguration.java | 5 +++--
.../apache/ambari/view/slider/SliderAppsResourceProvider.java | 5 +++--
.../apache/ambari/view/slider/SliderAppsViewControllerImpl.java | 5 +++--
.../org/apache/ambari/view/slider/rest/SliderAppsResource.java | 5 +++--
.../apache/ambari/view/slider/rest/client/AmbariHttpClient.java | 5 +++--
.../apache/ambari/view/slider/rest/client/BaseHttpClient.java | 5 +++--
.../java/org/apache/ambari/view/slider/rest/client/Metric.java | 5 +++--
.../ambari/view/slider/rest/client/SliderAppJmxHelper.java | 5 +++--
.../ambari/view/slider/rest/client/SliderAppMasterClient.java | 5 +++--
.../ambari/view/slider/rest/client/SliderAppMetricsHelper.java | 5 +++--
12 files changed, 36 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1180d02e/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppTypesResourceProvider.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppTypesResourceProvider.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppTypesResourceProvider.java
index 725c18a..2167748 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppTypesResourceProvider.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppTypesResourceProvider.java
@@ -31,14 +31,15 @@ import org.apache.ambari.view.ResourceProvider;
import org.apache.ambari.view.SystemException;
import org.apache.ambari.view.UnsupportedPropertyException;
import org.apache.hadoop.yarn.exceptions.YarnException;
-import org.apache.log4j.Logger;
import com.google.inject.Inject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SliderAppTypesResourceProvider implements
ResourceProvider<SliderAppType> {
- private static final Logger logger = Logger
+ private static final Logger logger = LoggerFactory
.getLogger(SliderAppTypesResourceProvider.class);
@Inject
private SliderAppsViewController sliderController;
http://git-wip-us.apache.org/repos/asf/ambari/blob/1180d02e/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsAlerts.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsAlerts.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsAlerts.java
index 4eb54d5..375e294 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsAlerts.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsAlerts.java
@@ -19,14 +19,15 @@
package org.apache.ambari.view.slider;
import com.google.inject.Singleton;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.lang.Exception;
import java.util.*;
@Singleton
public class SliderAppsAlerts {
- private static final Logger logger = Logger
+ private static final Logger logger = LoggerFactory
.getLogger(SliderAppsAlerts.class);
public Map<String, Object> generateComponentsAlerts(Map<String, SliderAppComponent> components, String service){
http://git-wip-us.apache.org/repos/asf/ambari/blob/1180d02e/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsConfiguration.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsConfiguration.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsConfiguration.java
index 05c7687..a02a668 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsConfiguration.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsConfiguration.java
@@ -20,12 +20,13 @@ package org.apache.ambari.view.slider;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SliderAppsConfiguration {
public static final SliderAppsConfiguration INSTANCE = new SliderAppsConfiguration();
- private static final Logger logger = Logger
+ private static final Logger logger = LoggerFactory
.getLogger(SliderAppsConfiguration.class);
private static final String SLIDER_APPS_PROPERTIES_FILE = "/slider.properties";
private PropertiesConfiguration propertiesConfig = null;
http://git-wip-us.apache.org/repos/asf/ambari/blob/1180d02e/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsResourceProvider.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsResourceProvider.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsResourceProvider.java
index 0c0dd12..1a92130 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsResourceProvider.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsResourceProvider.java
@@ -31,13 +31,14 @@ import org.apache.ambari.view.ResourceProvider;
import org.apache.ambari.view.SystemException;
import org.apache.ambari.view.UnsupportedPropertyException;
import org.apache.hadoop.yarn.exceptions.YarnException;
-import org.apache.log4j.Logger;
import com.google.inject.Inject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SliderAppsResourceProvider implements ResourceProvider<SliderApp> {
- private static final Logger logger = Logger
+ private static final Logger logger = LoggerFactory
.getLogger(SliderAppsResourceProvider.class);
@Inject
private SliderAppsViewController sliderController;
http://git-wip-us.apache.org/repos/asf/ambari/blob/1180d02e/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index ca50e33..72fb09f 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -64,7 +64,6 @@ import org.apache.hadoop.yarn.api.records.YarnApplicationState;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException;
import org.apache.hadoop.yarn.exceptions.YarnException;
-import org.apache.log4j.Logger;
import org.apache.slider.api.ClusterDescription;
import org.apache.slider.client.SliderClient;
import org.apache.slider.common.params.ActionCreateArgs;
@@ -92,10 +91,12 @@ import com.google.gson.JsonParser;
import com.google.gson.JsonPrimitive;
import com.google.inject.Inject;
import com.google.inject.Singleton;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Singleton
public class SliderAppsViewControllerImpl implements SliderAppsViewController {
- private static final Logger logger = Logger
+ private static final Logger logger = LoggerFactory
.getLogger(SliderAppsViewControllerImpl.class);
private static String METRICS_PREFIX = "metrics/";
@Inject
http://git-wip-us.apache.org/repos/asf/ambari/blob/1180d02e/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppsResource.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppsResource.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppsResource.java
index 9d17bce..94d37d3 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppsResource.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppsResource.java
@@ -45,16 +45,17 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.view.ViewResourceHandler;
import org.apache.ambari.view.slider.SliderAppsViewController;
import org.apache.hadoop.yarn.exceptions.YarnException;
-import org.apache.log4j.Logger;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.inject.Inject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SliderAppsResource {
- private static final Logger logger = Logger
+ private static final Logger logger = LoggerFactory
.getLogger(SliderAppsResource.class);
@Inject
ViewResourceHandler resourceHandler;
http://git-wip-us.apache.org/repos/asf/ambari/blob/1180d02e/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/AmbariHttpClient.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/AmbariHttpClient.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/AmbariHttpClient.java
index c3f4e38..de075df 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/AmbariHttpClient.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/AmbariHttpClient.java
@@ -36,17 +36,18 @@ import org.apache.ambari.view.slider.clients.AmbariService;
import org.apache.ambari.view.slider.clients.AmbariServiceInfo;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.HttpStatus;
-import org.apache.log4j.Logger;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.stream.JsonReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class AmbariHttpClient extends BaseHttpClient implements AmbariClient {
- private static final Logger logger = Logger.getLogger(AmbariHttpClient.class);
+ private static final Logger logger = LoggerFactory.getLogger(AmbariHttpClient.class);
public AmbariHttpClient(String url, String userId, String password,
ViewContext viewContext) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1180d02e/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/BaseHttpClient.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/BaseHttpClient.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/BaseHttpClient.java
index bfa1750..b4fccf9 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/BaseHttpClient.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/BaseHttpClient.java
@@ -30,14 +30,15 @@ import org.apache.ambari.view.utils.ambari.AmbariApi;
import org.apache.ambari.view.utils.ambari.URLStreamProviderBasicAuth;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
import com.google.gson.stream.JsonReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BaseHttpClient {
- private static final Logger logger = Logger.getLogger(BaseHttpClient.class);
+ private static final Logger logger = LoggerFactory.getLogger(BaseHttpClient.class);
private String url;
private boolean needsAuthentication;
http://git-wip-us.apache.org/repos/asf/ambari/blob/1180d02e/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/Metric.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/Metric.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/Metric.java
index 3f5a39d..1ec682b 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/Metric.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/Metric.java
@@ -18,9 +18,10 @@
package org.apache.ambari.view.slider.rest.client;
-import org.apache.log4j.Logger;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathExpression;
@@ -32,7 +33,7 @@ import java.util.List;
@JsonIgnoreProperties({"keyName", "matchers", "xPathExpression", "xPathExpressionComputed"})
public class Metric {
- private static final Logger logger = Logger
+ private static final Logger logger = LoggerFactory
.getLogger(Metric.class);
private static String SEPARATOR = ".";
private static char SEPARATOR_REPLACED = '#';
http://git-wip-us.apache.org/repos/asf/ambari/blob/1180d02e/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppJmxHelper.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppJmxHelper.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppJmxHelper.java
index d3ca1e4..7f7aae0 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppJmxHelper.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppJmxHelper.java
@@ -19,13 +19,14 @@
package org.apache.ambari.view.slider.rest.client;
import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
import org.codehaus.jackson.map.DeserializationConfig;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.ObjectReader;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -42,7 +43,7 @@ import java.util.Map;
public class SliderAppJmxHelper {
- private static final Logger logger = Logger
+ private static final Logger logger = LoggerFactory
.getLogger(SliderAppJmxHelper.class);
private static final String NAME_KEY = "name";
private static final String PORT_KEY = "tag.port";
http://git-wip-us.apache.org/repos/asf/ambari/blob/1180d02e/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMasterClient.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMasterClient.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMasterClient.java
index f0cc18b..708a214 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMasterClient.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMasterClient.java
@@ -36,14 +36,15 @@ import org.apache.ambari.view.slider.SliderAppTypeComponent;
import org.apache.ambari.view.slider.TemporalInfo;
import org.apache.commons.httpclient.HttpException;
import org.apache.ambari.view.slider.SliderAppsViewController;
-import org.apache.log4j.Logger;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SliderAppMasterClient extends BaseHttpClient {
- private static final Logger logger = Logger
+ private static final Logger logger = LoggerFactory
.getLogger(SliderAppMasterClient.class);
public SliderAppMasterClient(String url, ViewContext viewContext) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1180d02e/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMetricsHelper.java
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMetricsHelper.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMetricsHelper.java
index 6d5e89e..1044e9d 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMetricsHelper.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/client/SliderAppMetricsHelper.java
@@ -30,15 +30,16 @@ import org.apache.ambari.view.SystemException;
import org.apache.ambari.view.ViewContext;
import org.apache.ambari.view.slider.TemporalInfo;
import org.apache.http.client.utils.URIBuilder;
-import org.apache.log4j.Logger;
import org.codehaus.jackson.map.AnnotationIntrospector;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.ObjectReader;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.codehaus.jackson.xc.JaxbAnnotationIntrospector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SliderAppMetricsHelper {
- private static final Logger logger = Logger
+ private static final Logger logger = LoggerFactory
.getLogger(SliderAppMetricsHelper.class);
private static ObjectMapper mapper;
private final static ObjectReader timelineObjectReader;