Repository: ambari Updated Branches: refs/heads/trunk d9ebe6a82 -> 287c66a89
AMBARI-5591. Datanode start fails on multinode on Ubuntu (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/287c66a8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/287c66a8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/287c66a8 Branch: refs/heads/trunk Commit: 287c66a89aa6064568f6e2e13591568e1767a250 Parents: d9ebe6a Author: Andrew Onishuk <[email protected]> Authored: Mon Apr 28 16:06:45 2014 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Mon Apr 28 16:06:45 2014 +0300 ---------------------------------------------------------------------- .../stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/hook.py | 2 +- .../stacks/2.0.6/hooks/before-INSTALL/test_before_install.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/287c66a8/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/hook.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/hook.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/hook.py index 03859e4..5c023ae 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/hook.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/hook.py @@ -29,9 +29,9 @@ class BeforeConfigureHook(Hook): import params env.set_params(params) + install_packages() setup_java() setup_users() - install_packages() if __name__ == "__main__": BeforeConfigureHook().execute() http://git-wip-us.apache.org/repos/asf/ambari/blob/287c66a8/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py index 3aa370c..0c1babd 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py +++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-INSTALL/test_before_install.py @@ -28,6 +28,10 @@ class TestHookBeforeInstall(RMFTestCase): command="hook", config_file="default.json" ) + self.assertResourceCalled('Package', 'unzip', ) + self.assertResourceCalled('Package', 'curl', ) + self.assertResourceCalled('Package', 'net-snmp', ) + self.assertResourceCalled('Execute', 'mkdir -p /tmp/HDP-artifacts/ ; curl -kf --retry 10 http://c6401.ambari.apache.org:8080/resources//jdk-7u45-linux-x64.tar.gz -o /tmp/HDP-artifacts//jdk-7u45-linux-x64.tar.gz', not_if = 'test -e /usr/jdk64/jdk1.7.0_45/bin/java', path = ['/bin', '/usr/bin/'], @@ -100,7 +104,4 @@ class TestHookBeforeInstall(RMFTestCase): self.assertResourceCalled('User', 'tez', gid='hadoop', groups=['users'], ) - self.assertResourceCalled('Package', 'unzip', ) - self.assertResourceCalled('Package', 'curl', ) - self.assertResourceCalled('Package', 'net-snmp', ) self.assertNoMoreResources()
