浏览代码

AMBARI-4737. Falcon Server can not be restarted (Eugene Chekanskiy via dlysnichenko)

Lisnichenko Dmitro 11 年之前
父节点
当前提交
093ee03f14

+ 3 - 0
ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/package/scripts/falcon.py

@@ -63,3 +63,6 @@ def falcon(type, action = None):
                      '{falcon_home}/bin/falcon-stop'),
               user=params.falcon_user
       )
+      File(params.server_pid_file,
+           action='delete'
+      )

+ 3 - 0
ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/package/scripts/params.py

@@ -19,6 +19,9 @@ limitations under the License.
 
 from resource_management import *
 
+import status_params
+from status_params import server_pid_file
+
 config = Script.get_config()
 
 oozie_user = config['configurations']['global']['oozie_user']

+ 3 - 0
ambari-server/src/test/python/stacks/2.1.1/FALCON/test_falcon_server.py

@@ -56,6 +56,9 @@ class TestFalconServer(RMFTestCase):
     self.assertResourceCalled('Execute',
                           'env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 FALCON_LOG_DIR=/var/log/falcon FALCON_PID_DIR=/var/run/falcon FALCON_DATA_DIR=/hadoop/falcon/activemq /usr/lib/falcon/bin/falcon-stop',
                           user='falcon', )
+    self.assertResourceCalled('File',
+                              '/var/run/falcon/falcon.pid',
+                              action=['delete'])
     self.assertNoMoreResources()
 
   def test_configure_default(self):