AMBARI-20032. HDFS service check fails after Stopping one Namenode in HA cluster (echekanskiy)

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",

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,