You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2018/01/02 16:56:18 UTC
[27/37] ambari git commit: AMBARI-22506.Incorrect pie chart
distribution(Venkata Sairam)
AMBARI-22506.Incorrect pie chart distribution(Venkata Sairam)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c1b8cda9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c1b8cda9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c1b8cda9
Branch: refs/heads/branch-feature-AMBARI-21674
Commit: c1b8cda9608180cd00384a8453e3e5f78a865cb2
Parents: 0288728
Author: Venkata Sairam <ve...@gmail.com>
Authored: Thu Dec 28 12:07:19 2017 +0530
Committer: Venkata Sairam <ve...@gmail.com>
Committed: Thu Dec 28 12:07:19 2017 +0530
----------------------------------------------------------------------
.../ZEPPELIN/0.7.0/package/scripts/master.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c1b8cda9/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
index df892f8..efa3ffe 100644
--- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
+++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
@@ -539,9 +539,14 @@ class Master(Script):
if params.zookeeper_znode_parent \
and params.hbase_zookeeper_quorum:
interpreter['properties']['phoenix.driver'] = 'org.apache.phoenix.jdbc.PhoenixDriver'
- interpreter['properties']['phoenix.hbase.client.retries.number'] = '1'
- interpreter['properties']['phoenix.user'] = 'phoenixuser'
- interpreter['properties']['phoenix.password'] = ''
+ if 'phoenix.hbase.client.retries.number' not in interpreter['properties']:
+ interpreter['properties']['phoenix.hbase.client.retries.number'] = '1'
+ if 'phoenix.phoenix.query.numberFormat' not in interpreter['properties']:
+ interpreter['properties']['phoenix.phoenix.query.numberFormat'] = '#.#'
+ if 'phoenix.user' not in interpreter['properties']:
+ interpreter['properties']['phoenix.user'] = 'phoenixuser'
+ if 'phoenix.password' not in interpreter['properties']:
+ interpreter['properties']['phoenix.password'] = ''
interpreter['properties']['phoenix.url'] = "jdbc:phoenix:" + \
params.hbase_zookeeper_quorum + ':' + \
params.zookeeper_znode_parent