You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/02/17 13:38:34 UTC
git commit: AMBARI-4696. Deprecation warnings show up in stderr
because of using sets in Ganglia (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 5cd82eb23 -> ef1e7a232
AMBARI-4696. Deprecation warnings show up in stderr because of using
sets in Ganglia (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ef1e7a23
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ef1e7a23
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ef1e7a23
Branch: refs/heads/trunk
Commit: ef1e7a232c1c1a5381fae9acea006a31cef110cb
Parents: 5cd82eb
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Mon Feb 17 04:37:45 2014 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Mon Feb 17 04:38:24 2014 -0800
----------------------------------------------------------------------
.../services/GANGLIA/package/scripts/params.py | 17 ++++++------
.../services/GANGLIA/package/scripts/params.py | 27 ++++++++++----------
2 files changed, 21 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ef1e7a23/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
index f9c90c5..2213392 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
@@ -18,7 +18,6 @@ limitations under the License.
from resource_management import *
from resource_management.core.system import System
-from sets import Set
config = Script.get_config()
@@ -38,15 +37,15 @@ rrdcached_base_dir = config['configurations']['global']["rrdcached_base_dir"]
ganglia_server_host = config["clusterHostInfo"]["ganglia_server_host"][0]
hostname = config["hostname"]
-namenode_host = Set(default("/clusterHostInfo/namenode_host", []))
-jtnode_host = Set(default("/clusterHostInfo/jtnode_host", []))
-hs_host = Set(default("/clusterHostInfo/hs_host", []))
-hbase_master_hosts = Set(default("/clusterHostInfo/hbase_master_hosts", []))
+namenode_host = set(default("/clusterHostInfo/namenode_host", []))
+jtnode_host = set(default("/clusterHostInfo/jtnode_host", []))
+hs_host = set(default("/clusterHostInfo/hs_host", []))
+hbase_master_hosts = set(default("/clusterHostInfo/hbase_master_hosts", []))
# datanodes are marked as slave_hosts
-slave_hosts = Set(default("/clusterHostInfo/slave_hosts", []))
-tt_hosts = Set(default("/clusterHostInfo/mapred_tt_hosts", []))
-hbase_rs_hosts = Set(default("/clusterHostInfo/hbase_rs_hosts", []))
-flume_hosts = Set(default("/clusterHostInfo/flume_hosts", []))
+slave_hosts = set(default("/clusterHostInfo/slave_hosts", []))
+tt_hosts = set(default("/clusterHostInfo/mapred_tt_hosts", []))
+hbase_rs_hosts = set(default("/clusterHostInfo/hbase_rs_hosts", []))
+flume_hosts = set(default("/clusterHostInfo/flume_hosts", []))
pure_slave = not hostname in (namenode_host | jtnode_host | hs_host | hbase_master_hosts | slave_hosts | tt_hosts | hbase_rs_hosts | flume_hosts)
is_namenode_master = hostname in namenode_host
http://git-wip-us.apache.org/repos/asf/ambari/blob/ef1e7a23/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
index 434c59c..c9997df 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
@@ -18,7 +18,6 @@ limitations under the License.
from resource_management import *
from resource_management.core.system import System
-from sets import Set
config = Script.get_config()
@@ -38,20 +37,20 @@ rrdcached_base_dir = config['configurations']['global']["rrdcached_base_dir"]
ganglia_server_host = config["clusterHostInfo"]["ganglia_server_host"][0]
hostname = config["hostname"]
-namenode_host = Set(default("/clusterHostInfo/namenode_host", []))
-jtnode_host = Set(default("/clusterHostInfo/jtnode_host", []))
-rm_host = Set(default("/clusterHostInfo/rm_host", []))
-hs_host = Set(default("/clusterHostInfo/hs_host", []))
-hbase_master_hosts = Set(default("/clusterHostInfo/hbase_master_hosts", []))
+namenode_host = set(default("/clusterHostInfo/namenode_host", []))
+jtnode_host = set(default("/clusterHostInfo/jtnode_host", []))
+rm_host = set(default("/clusterHostInfo/rm_host", []))
+hs_host = set(default("/clusterHostInfo/hs_host", []))
+hbase_master_hosts = set(default("/clusterHostInfo/hbase_master_hosts", []))
# datanodes are marked as slave_hosts
-slave_hosts = Set(default("/clusterHostInfo/slave_hosts", []))
-tt_hosts = Set(default("/clusterHostInfo/mapred_tt_hosts", []))
-nm_hosts = Set(default("/clusterHostInfo/nm_hosts", []))
-hbase_rs_hosts = Set(default("/clusterHostInfo/hbase_rs_hosts", []))
-flume_hosts = Set(default("/clusterHostInfo/flume_hosts", []))
-jn_hosts = Set(default("/clusterHostInfo/journalnode_hosts", []))
-nimbus_server_hosts = Set(default("/clusterHostInfo/nimbus_hosts", []))
-supervisor_server_hosts = Set(default("/clusterHostInfo/supervisor_hosts", []))
+slave_hosts = set(default("/clusterHostInfo/slave_hosts", []))
+tt_hosts = set(default("/clusterHostInfo/mapred_tt_hosts", []))
+nm_hosts = set(default("/clusterHostInfo/nm_hosts", []))
+hbase_rs_hosts = set(default("/clusterHostInfo/hbase_rs_hosts", []))
+flume_hosts = set(default("/clusterHostInfo/flume_hosts", []))
+jn_hosts = set(default("/clusterHostInfo/journalnode_hosts", []))
+nimbus_server_hosts = set(default("/clusterHostInfo/nimbus_hosts", []))
+supervisor_server_hosts = set(default("/clusterHostInfo/supervisor_hosts", []))
pure_slave = not hostname in (namenode_host | jtnode_host | rm_host | hs_host |\
hbase_master_hosts |slave_hosts | tt_hosts | hbase_rs_hosts |\