You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/09/10 20:57:16 UTC
ambari git commit: AMBARI-13061 Empty properties in ams-site (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk f1d6ef340 -> 621e5c31c
AMBARI-13061 Empty properties in ams-site (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/621e5c31
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/621e5c31
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/621e5c31
Branch: refs/heads/trunk
Commit: 621e5c31cd12648e88bf644ec1fb930da51ec447
Parents: f1d6ef3
Author: Dmytro Sen <ds...@apache.org>
Authored: Thu Sep 10 21:56:27 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Thu Sep 10 21:56:49 2015 +0300
----------------------------------------------------------------------
.../metrics/timeline/PhoenixHBaseAccessor.java | 2 +-
.../AMBARI_METRICS/0.1.0/configuration/ams-site.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/621e5c31/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
index 7dfd8a7..9117b79 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
+++ b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
@@ -337,7 +337,7 @@ public class PhoenixHBaseAccessor {
}
protected String getSplitPointsStr(String splitPoints) {
- if (StringUtils.isEmpty(splitPoints)) {
+ if (splitPoints == null || StringUtils.isEmpty(splitPoints.trim())) {
return "";
}
String[] points = splitPoints.split(",");
http://git-wip-us.apache.org/repos/asf/ambari/blob/621e5c31/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
index 95d94a5..221e2df 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
@@ -328,7 +328,7 @@
</property>
<property>
<name>timeline.metrics.host.aggregate.splitpoints</name>
- <value></value>
+ <value> </value>
<description>
Pre-split regions using the split points corresponding to this property
for the precision table that stores seconds aggregate data.
@@ -336,7 +336,7 @@
</property>
<property>
<name>timeline.metrics.cluster.aggregate.splitpoints</name>
- <value></value>
+ <value> </value>
<description>
Pre-split regions using the split points corresponding to this property
for the aggregate table that stores seconds aggregate data across hosts.