Repository: ambari Updated Branches: refs/heads/trunk eaa67b97d -> 401fb1993
AMBARI-7632 Falcon service check fails on HDP2.2 (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/401fb199 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/401fb199 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/401fb199 Branch: refs/heads/trunk Commit: 401fb199381bd04d7fab63f102f5d64e94572cc8 Parents: eaa67b9 Author: Dmytro Sen <d...@hortonworks.com> Authored: Fri Oct 3 18:23:54 2014 +0300 Committer: Dmytro Sen <d...@hortonworks.com> Committed: Fri Oct 3 20:46:55 2014 +0300 ---------------------------------------------------------------------- .../HDP/2.1/services/FALCON/configuration/falcon-env.xml | 2 +- .../stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py | 6 ++++-- .../src/test/python/stacks/2.1/FALCON/test_falcon_server.py | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/401fb199/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/falcon-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/falcon-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/falcon-env.xml index 2c744e6..0eaad86 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/falcon-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/configuration/falcon-env.xml @@ -91,7 +91,7 @@ export FALCON_SERVER_OPTS="-Dfalcon.embeddedmq={{falcon_embeddedmq_enabled}} -Df # java heap size we want to set for the falcon server. Default is 1024MB #export FALCON_SERVER_HEAP= -# What is is considered as falcon home dir. Default is the base locaion of the installed software +# What is is considered as falcon home dir. Default is the base location of the installed software #export FALCON_HOME_DIR= # Where log files are stored. Defatult is logs directory under the base install location http://git-wip-us.apache.org/repos/asf/ambari/blob/401fb199/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py index 25ecef8..05a685a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py @@ -79,11 +79,13 @@ def falcon(type, action = None): if action == 'start': Execute(format('{falcon_home}/bin/falcon-start -port {falcon_port}'), - user=params.falcon_user + user=params.falcon_user, + path=params.hadoop_bin_dir ) if action == 'stop': Execute(format('{falcon_home}/bin/falcon-stop'), - user=params.falcon_user + user=params.falcon_user, + path=params.hadoop_bin_dir ) File(params.server_pid_file, action='delete' http://git-wip-us.apache.org/repos/asf/ambari/blob/401fb199/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py index d747482..57bf715 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py +++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py @@ -31,6 +31,7 @@ class TestFalconServer(RMFTestCase): ) self.assert_configure_default() self.assertResourceCalled('Execute', '/usr/lib/falcon/bin/falcon-start -port 15000', + path = ['/usr/bin'], user = 'falcon', ) self.assertNoMoreResources() @@ -42,6 +43,7 @@ class TestFalconServer(RMFTestCase): config_file="default.json" ) self.assertResourceCalled('Execute', '/usr/lib/falcon/bin/falcon-stop', + path = ['/usr/bin'], user = 'falcon', ) self.assertResourceCalled('File', '/var/run/falcon/falcon.pid',
