incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject git commit: AMBARI-3476. Time-series data are not coming thru via the API on CentOS 5 (graphs are being shown in Ganglia).
Date Tue, 08 Oct 2013 01:52:58 GMT
Updated Branches:
  refs/heads/trunk bc6503b86 -> 7e89b1116


AMBARI-3476. Time-series data are not coming thru via the API on CentOS 5 (graphs are being
shown in Ganglia).


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/7e89b111
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/7e89b111
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/7e89b111

Branch: refs/heads/trunk
Commit: 7e89b1116e23dd17d91f1f7b417c7361074cce68
Parents: bc6503b
Author: Mahadev Konar <mahadev@apache.org>
Authored: Mon Oct 7 18:53:42 2013 -0700
Committer: Mahadev Konar <mahadev@apache.org>
Committed: Mon Oct 7 18:53:50 2013 -0700

----------------------------------------------------------------------
 .../src/main/puppet/modules/hdp-ganglia/files/rrd.py   | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7e89b111/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/rrd.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/rrd.py b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/rrd.py
index 2656dd7..2e3f07a 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/rrd.py
+++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/rrd.py
@@ -139,9 +139,20 @@ if "pt" in queryString:
   pointInTime = True
 else:
   pointInTime = False
+  
+def _walk(*args, **kwargs):
+ 
+  for root,dirs,files in os.walk(*args, **kwargs):
+    for dir in dirs:
+      qualified_dir = os.path.join(root,dir)
+      if os.path.islink(qualified_dir):
+        for x in os.walk(qualified_dir, **kwargs):
+          yield x
+    yield (root, dirs, files)
+    
 
 for cluster in clusterParts:
-  for path, dirs, files in os.walk(rrdPath + cluster,followlinks=True):
+  for path, dirs, files in _walk(rrdPath + cluster):
     pathParts = path.split("/")
     if len(hostParts) == 0 or pathParts[-1] in hostParts:
       for file in files:


Mime
View raw message