Prechádzať zdrojové kódy

AMBARI-8524. Fix zookeeper server start failure on trunk (aonishuk)

Andrew Onishuk 10 rokov pred
rodič
commit
0a6a64477e

+ 3 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/zookeeper_service.py

@@ -45,12 +45,15 @@ def zookeeper_service(action='start'):
     create_command = format("echo 'create /zk_test mydata' | {zk_cli_shell}")
     list_command = format("echo 'ls /' | {zk_cli_shell}")
     delete_command = format("echo 'delete /zk_test ' | {zk_cli_shell}")
+    # FIXME: this makes ZK service start to fail
+    """
     Execute(create_command,
             user=params.smokeuser)
     Execute(list_command,
             user=params.smokeuser)
     Execute(delete_command,
             user=params.smokeuser)
+    """
 
   elif action == 'stop':
     daemon_cmd = format("source {config_dir}/zookeeper-env.sh ; {cmd} stop")

+ 0 - 12
ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py

@@ -44,12 +44,6 @@ class TestZookeeperServer(RMFTestCase):
                     not_if = 'ls /var/run/zookeeper/zookeeper_server.pid >/dev/null 2>&1 && ps -p `cat /var/run/zookeeper/zookeeper_server.pid` >/dev/null 2>&1',
                     user = 'zookeeper'
     )
-    self.assertResourceCalled('Execute', "echo 'create /zk_test mydata' | /usr/lib/zookeeper/bin/zkCli.sh",
-                              user="ambari-qa")
-    self.assertResourceCalled('Execute', "echo 'ls /' | /usr/lib/zookeeper/bin/zkCli.sh",
-                              user="ambari-qa")
-    self.assertResourceCalled('Execute', "echo 'delete /zk_test ' | /usr/lib/zookeeper/bin/zkCli.sh",
-                              user="ambari-qa")
     self.assertNoMoreResources()
 
   def test_stop_default(self):
@@ -88,12 +82,6 @@ class TestZookeeperServer(RMFTestCase):
     )
     self.assertResourceCalled('Execute', "/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa;",
                               user="ambari-qa")
-    self.assertResourceCalled('Execute', "echo 'create /zk_test mydata' | /usr/lib/zookeeper/bin/zkCli.sh",
-                              user="ambari-qa")
-    self.assertResourceCalled('Execute', "echo 'ls /' | /usr/lib/zookeeper/bin/zkCli.sh",
-                              user="ambari-qa")
-    self.assertResourceCalled('Execute', "echo 'delete /zk_test ' | /usr/lib/zookeeper/bin/zkCli.sh",
-                              user="ambari-qa")
     self.assertNoMoreResources()
 
   def test_stop_secured(self):