You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ec...@apache.org on 2017/02/28 12:09:41 UTC
ambari git commit: AMBARI-20032. HDFS service check fails after
Stopping one Namenode in HA cluster (echekanskiy)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 2081ca0fa -> 0b8827b7e
AMBARI-20032. HDFS service check fails after Stopping one Namenode in HA cluster (echekanskiy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0b8827b7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0b8827b7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0b8827b7
Branch: refs/heads/branch-2.5
Commit: 0b8827b7e17d50758f5cb0d4d0cf2fe6bac70b20
Parents: 2081ca0
Author: Eugene Chekanskiy <ec...@hortonworks.com>
Authored: Tue Feb 28 14:06:28 2017 +0200
Committer: Eugene Chekanskiy <ec...@hortonworks.com>
Committed: Tue Feb 28 14:06:28 2017 +0200
----------------------------------------------------------------------
.../HDFS/2.1.0.2.0/package/scripts/service_check.py | 10 ----------
.../test/python/stacks/2.0.6/HDFS/test_service_check.py | 8 --------
2 files changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b8827b7/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py
index dffa077..3d798a3 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py
@@ -37,20 +37,10 @@ class HdfsServiceCheckDefault(HdfsServiceCheck):
dir = params.hdfs_tmp_dir
tmp_file = format("{dir}/{unique}")
- safemode_command = format("dfsadmin -fs {namenode_address} -safemode get | grep OFF")
-
if params.security_enabled:
Execute(format("{kinit_path_local} -kt {hdfs_user_keytab} {hdfs_principal_name}"),
user=params.hdfs_user
)
- ExecuteHadoop(safemode_command,
- user=params.hdfs_user,
- logoutput=True,
- conf_dir=params.hadoop_conf_dir,
- try_sleep=3,
- tries=20,
- bin_dir=params.hadoop_bin_dir
- )
params.HdfsResource(dir,
type="directory",
action="create_on_execute",
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b8827b7/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
index bbc1b3a..5ad836f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_service_check.py
@@ -52,14 +52,6 @@ class TestServiceCheck(RMFTestCase):
self.assertNoMoreResources()
def assert_service_check(self):
- self.assertResourceCalled('ExecuteHadoop', 'dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep OFF',
- logoutput = True,
- tries = 20,
- conf_dir = '/etc/hadoop/conf',
- try_sleep = 3,
- bin_dir = '/usr/bin',
- user = 'hdfs',
- )
self.assertResourceCalled('HdfsResource', '/tmp',
immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
security_enabled = False,