You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2015/12/03 22:15:23 UTC
ambari git commit: AMBARI-14184. AMS scripts should fully support
other hcfs FSs (Dmytro Sen via smohanty)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 51e890416 -> 10543dd33
AMBARI-14184. AMS scripts should fully support other hcfs FSs (Dmytro Sen via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/10543dd3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/10543dd3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/10543dd3
Branch: refs/heads/branch-2.2
Commit: 10543dd33f9592d720153de8ed4dcb0da81f8486
Parents: 51e8904
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Dec 3 13:13:41 2015 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Dec 3 13:13:41 2015 -0800
----------------------------------------------------------------------
.../common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py | 4 ++--
.../AMBARI_METRICS/0.1.0/package/scripts/hbase.py | 2 +-
.../AMBARI_METRICS/0.1.0/package/scripts/params.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/10543dd3/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
index 84aaa0e..615e93a 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
@@ -77,7 +77,7 @@ def ams(name=None):
username = params.ams_user,
password = Script.get_password(params.ams_user))
- if params.is_hdfs_rootdir:
+ if not params.is_local_fs_rootdir:
# Configuration needed to support NN HA
XmlConfig("hdfs-site.xml",
conf_dir=params.ams_collector_conf_dir,
@@ -285,7 +285,7 @@ def ams(name=None):
)
pass
- if params.is_hdfs_rootdir:
+ if not params.is_local_fs_rootdir:
# Configuration needed to support NN HA
XmlConfig("hdfs-site.xml",
conf_dir=params.ams_collector_conf_dir,
http://git-wip-us.apache.org/repos/asf/ambari/blob/10543dd3/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
index cc86e27..92d2bc4 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
@@ -190,7 +190,7 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
if name == "master":
- if params.is_hdfs_rootdir:
+ if not params.is_local_fs_rootdir:
# If executing Stop All, HDFS is probably down
if action != 'stop':
http://git-wip-us.apache.org/repos/asf/ambari/blob/10543dd3/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index 8b99f96..302b376 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -86,7 +86,7 @@ hbase_root_dir = config['configurations']['ams-hbase-site']['hbase.rootdir']
hbase_pid_dir = status_params.hbase_pid_dir
is_hbase_distributed = config['configurations']['ams-hbase-site']['hbase.cluster.distributed']
-is_hdfs_rootdir = hbase_root_dir.startswith('hdfs://')
+is_local_fs_rootdir = hbase_root_dir.startswith('file://')
# security is disabled for embedded mode, when HBase is backed by file
security_enabled = False if not is_hbase_distributed else config['configurations']['cluster-env']['security_enabled']