You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by tb...@apache.org on 2013/11/26 15:08:03 UTC
git commit: AMBARI-3880 - HDFS and HBase time series and other data
are not coming thru via API
Updated Branches:
refs/heads/trunk 1536c7a58 -> f0682821b
AMBARI-3880 - HDFS and HBase time series and other data are not coming thru via API
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f0682821
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0682821
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0682821
Branch: refs/heads/trunk
Commit: f0682821b57aa3e2546a469968bcdd2b70a0d019
Parents: 1536c7a
Author: tbeerbower <tb...@hortonworks.com>
Authored: Tue Nov 26 09:07:42 2013 -0500
Committer: tbeerbower <tb...@hortonworks.com>
Committed: Tue Nov 26 09:07:42 2013 -0500
----------------------------------------------------------------------
.../server/controller/internal/AbstractProviderModule.java | 2 +-
.../ambari/server/controller/internal/RequestImpl.java | 2 +-
.../ambari/server/controller/jmx/JMXPropertyProvider.java | 9 +++++++++
3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0682821/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 de9e5f8..5d106bd 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
@@ -383,7 +383,7 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
this,
streamProvider,
PropertyHelper.getPropertyId("ServiceComponentInfo", "cluster_name"),
- PropertyHelper.getPropertyId("ServiceComponentInfo", "host_name"),
+ null,
PropertyHelper.getPropertyId("ServiceComponentInfo", "component_name"),
PropertyHelper.getPropertyId("ServiceComponentInfo", "state"),
jpp,
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0682821/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestImpl.java
index fce29fe..93eaf0a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestImpl.java
@@ -105,7 +105,7 @@ public class RequestImpl implements Request {
@Override
public TemporalInfo getTemporalInfo(String id) {
- return m_mapTemporalInfo.get(id);
+ return m_mapTemporalInfo == null ? null : m_mapTemporalInfo.get(id);
}
private void setTemporalInfo(Map<String, TemporalInfo> mapTemporalInfo) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/f0682821/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 1f9bbff..4de36ca 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
@@ -279,6 +279,15 @@ public class JMXPropertyProvider extends AbstractPropertyProvider {
throws SystemException {
Set<String> ids = getRequestPropertyIds(request, predicate);
+ Set<String> temporalIds = new HashSet<String>();
+
+ for (String id : ids) {
+ if (request.getTemporalInfo(id) != null) {
+ temporalIds.add(id);
+ }
+ }
+ ids.removeAll(temporalIds);
+
if (ids.isEmpty()) {
// no properties requested
return resource;