Browse Source

AMBARI-7632 Falcon service check fails on HDP2.2 (dsen)

Dmytro Sen 10 years ago
parent
commit
401fb19938

+ 1 - 1
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
 # java heap size we want to set for the falcon server. Default is 1024MB
 #export FALCON_SERVER_HEAP=
 #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=
 #export FALCON_HOME_DIR=
 
 
 # Where log files are stored. Defatult is logs directory under the base install location
 # Where log files are stored. Defatult is logs directory under the base install location

+ 4 - 2
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':
     if action == 'start':
       Execute(format('{falcon_home}/bin/falcon-start -port {falcon_port}'),
       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':
     if action == 'stop':
       Execute(format('{falcon_home}/bin/falcon-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,
       File(params.server_pid_file,
            action='delete'
            action='delete'

+ 2 - 0
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.assert_configure_default()
     self.assertResourceCalled('Execute', '/usr/lib/falcon/bin/falcon-start -port 15000',
     self.assertResourceCalled('Execute', '/usr/lib/falcon/bin/falcon-start -port 15000',
+                              path = ['/usr/bin'],
                               user = 'falcon',
                               user = 'falcon',
                               )
                               )
     self.assertNoMoreResources()
     self.assertNoMoreResources()
@@ -42,6 +43,7 @@ class TestFalconServer(RMFTestCase):
                        config_file="default.json"
                        config_file="default.json"
     )
     )
     self.assertResourceCalled('Execute', '/usr/lib/falcon/bin/falcon-stop',
     self.assertResourceCalled('Execute', '/usr/lib/falcon/bin/falcon-stop',
+                              path = ['/usr/bin'],
                               user = 'falcon',
                               user = 'falcon',
                               )
                               )
     self.assertResourceCalled('File', '/var/run/falcon/falcon.pid',
     self.assertResourceCalled('File', '/var/run/falcon/falcon.pid',