You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2015/09/11 01:23:38 UTC

ambari git commit: AMBARI-13039. Optimize precision table Region split policy for AMS. Fix for blank configs. (swagle)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 c83844339 -> 4670af58f


AMBARI-13039. Optimize precision table Region split policy for AMS. Fix for blank configs. (swagle)


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

Branch: refs/heads/branch-2.1
Commit: 4670af58faa8bdd236a40b0086de4cdb360d1854
Parents: c838443
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Thu Sep 10 16:23:27 2015 -0700
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Thu Sep 10 16:23:27 2015 -0700

----------------------------------------------------------------------
 .../stacks/HDP/2.0.6/services/stack_advisor.py         | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4670af58/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index 28dd007..c83dd47 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -378,8 +378,14 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
       serviceMetricsDir, mode, servicesList)
 
     result = split_point_finder.get_split_points()
-    putTimelineServiceProperty("timeline.metrics.host.aggregate.splitpoints", ','.join(result.precision))
-    putTimelineServiceProperty("timeline.metrics.cluster.aggregate.splitpoints", ','.join(result.aggregate))
+    precision_splits = ' '
+    aggregate_splits = ' '
+    if result.precision:
+      precision_splits = result.precision
+    if result.aggregate:
+      aggregate_splits = result.aggregate
+    putTimelineServiceProperty("timeline.metrics.host.aggregate.splitpoints", ','.join(precision_splits))
+    putTimelineServiceProperty("timeline.metrics.cluster.aggregate.splitpoints", ','.join(aggregate_splits))
 
     pass
 
@@ -624,9 +630,10 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
           validationItems.extend([{"config-name": 'hbase.rootdir', "item": self.validatorNotRootFs(properties, 'hbase.rootdir', host["Hosts"])}])
           validationItems.extend([{"config-name": 'hbase.tmp.dir', "item": self.validatorNotRootFs(properties, 'hbase.tmp.dir', host["Hosts"])}])
 
+          dn_hosts = self.getComponentHostNames(services, "HDFS", "DATANODE")
           # if METRICS_COLLECTOR is co-hosted with DATANODE
           if not hbase_rootdir.startswith("hdfs") and \
-              collectorHostName in self.getComponentHostNames(services, "HDFS", "DATANODE"):
+            dn_hosts and collectorHostName in dn_hosts:
             # cross-check dfs.datanode.data.dir and hbase.rootdir
             # they shouldn't share same disk partition IO
             hdfs_site = getSiteProperties(configurations, "hdfs-site")