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/12/03 17:00:07 UTC
ambari git commit: AMBARI-8524. Fix zookeeper server start failure on
trunk (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 71cf447e6 -> 0a6a64477
AMBARI-8524. Fix zookeeper server start failure on trunk (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0a6a6447
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0a6a6447
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0a6a6447
Branch: refs/heads/trunk
Commit: 0a6a64477e1cc45c22a7542cb43498645fe37f74
Parents: 71cf447
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Dec 3 17:59:54 2014 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Dec 3 17:59:54 2014 +0200
----------------------------------------------------------------------
.../ZOOKEEPER/package/scripts/zookeeper_service.py | 3 +++
.../stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py | 12 ------------
2 files changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0a6a6447/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/zookeeper_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/zookeeper_service.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/zookeeper_service.py
index 69020ac..724e101 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/zookeeper_service.py
+++ b/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")
http://git-wip-us.apache.org/repos/asf/ambari/blob/0a6a6447/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py b/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
index a0cb846..2269c34 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/ZOOKEEPER/test_zookeeper_server.py
+++ b/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):