Updated Branches: refs/heads/trunk fb7e4a212 -> 43cbbdeb8
AMBARI-3216. 500 Status error with HBase service deployed. (Dilli Arumugam via swagle) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/43cbbdeb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/43cbbdeb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/43cbbdeb Branch: refs/heads/trunk Commit: 43cbbdeb8013e41fde76df8ab7b5babccb10def1 Parents: fb7e4a2 Author: Siddharth Wagle <[email protected]> Authored: Thu Sep 12 16:01:38 2013 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Thu Sep 12 16:01:45 2013 -0700 ---------------------------------------------------------------------- .../controller/internal/AbstractProviderModule.java | 16 ++++++++++++---- .../server/controller/jmx/JMXPropertyProvider.java | 5 ----- 2 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/43cbbdeb/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java index d7272df..0f392d0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java @@ -743,13 +743,21 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource } } catch (Exception e) { - LOG.error("Exception while detecting JMX protocol for component: " + - componentName, e); - LOG.error("Defaulting to HTTP protocol for component: " + + LOG.error("Exception while detecting JMX protocol for clusterName = " + clusterName + + ", componentName = " + componentName, e); + LOG.error("Defaulting JMX to HTTP protocol for for clusterName = " + clusterName + + ", componentName = " + componentName + + componentName); + jmxProtocolString = "http"; + } + if (jmxProtocolString == null) { + LOG.error("Detected JMX protocol is null for clusterName = " + clusterName + + ", componentName = " + componentName); + LOG.error("Defaulting JMX to HTTP protocol for for clusterName = " + clusterName + + ", componentName = " + componentName + componentName); jmxProtocolString = "http"; } - if (LOG.isDebugEnabled()) { LOG.debug("JMXProtocol = " + jmxProtocolString + ", for clusterName=" + clusterName + ", componentName = " + componentName); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/43cbbdeb/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java index 468e338..dc1c61e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java @@ -314,11 +314,6 @@ public class JMXPropertyProvider extends AbstractPropertyProvider { } String protocol = getJMXProtocol(clusterName, componentName); - if (protocol == null) { - throw new SystemException( - "Unable to get JMX metrics. No protocol name for " + componentName, null); - } - try { InputStream in = streamProvider.readFrom(getSpec(protocol, hostName, port));
