ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmitriu...@apache.org
Subject git commit: AMBARI-4393. Fix several bugs in Falcon python scripts (Eugene Chekanskiy via dlysnichenko)
Date Thu, 23 Jan 2014 14:56:00 GMT
Updated Branches:
  refs/heads/trunk 386330fde -> db264c8c5


AMBARI-4393. Fix several bugs in Falcon python scripts (Eugene Chekanskiy via dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/db264c8c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/db264c8c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/db264c8c

Branch: refs/heads/trunk
Commit: db264c8c5ec3c903b839fd1a82639b1dfac1610f
Parents: 386330f
Author: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Authored: Thu Jan 23 16:55:03 2014 +0200
Committer: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Committed: Thu Jan 23 16:55:03 2014 +0200

----------------------------------------------------------------------
 .../HDP/2.1.1/services/FALCON/package/scripts/falcon_server.py   | 2 +-
 .../HDP/2.1.1/services/FALCON/package/scripts/service_check.py   | 4 +++-
 .../stacks/HDP/2.1.1/services/HDFS/package/scripts/params.py     | 2 +-
 .../stacks/HDP/2.1.1/services/OOZIE/package/scripts/oozie.py     | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/db264c8c/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/package/scripts/falcon_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/package/scripts/falcon_server.py
b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/package/scripts/falcon_server.py
index 9415694..fa3bc40 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/package/scripts/falcon_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/package/scripts/falcon_server.py
@@ -54,7 +54,7 @@ class FalconServer(Script):
     import status_params
 
     env.set_params(status_params)
-    check_process_status(status_params.falcon_pid_dir)
+    check_process_status(status_params.server_pid_file)
 
 
 if __name__ == "__main__":

http://git-wip-us.apache.org/repos/asf/ambari/blob/db264c8c/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/package/scripts/service_check.py
b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/package/scripts/service_check.py
index 19fbaf4..df40af7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/FALCON/package/scripts/service_check.py
@@ -31,7 +31,9 @@ class FalconServiceCheck(Script):
                    "FALCON_PID_DIR=/var/run/falcon FALCON_DATA_DIR={falcon_data_dir} "
                    "{falcon_home}/bin/falcon admin -version"),
             user=params.smoke_user,
-            logoutput=True
+            logoutput=True,
+            tries = 3,
+            try_sleep = 20
     )
 
 if __name__ == "__main__":

http://git-wip-us.apache.org/repos/asf/ambari/blob/db264c8c/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/HDFS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/HDFS/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/HDFS/package/scripts/params.py
index adbd4ef..3ba6f15 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/HDFS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/HDFS/package/scripts/params.py
@@ -190,4 +190,4 @@ journalnode_address = default('/configurations/hdfs-site/dfs.journalnode.http-ad
 if journalnode_address:
   journalnode_port = journalnode_address.split(":")[1]
 
-falcon_store_uri = default('configurations/global/falcon_store_uri', None)
+falcon_store_uri = config['configurations']['global']['falcon_store_uri']

http://git-wip-us.apache.org/repos/asf/ambari/blob/db264c8c/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/OOZIE/package/scripts/oozie.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/OOZIE/package/scripts/oozie.py
b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/OOZIE/package/scripts/oozie.py
index 1422d1e..df4f796 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/OOZIE/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/OOZIE/package/scripts/oozie.py
@@ -107,7 +107,7 @@ def oozie_server_specific(
     cmd3 += format(" && cp {jdbc_driver_jar} {oozie_libext_dir}")
   #falcon el extension
   if params.has_falcon_host:
-    Execute(format('cp {falcon_home}/oozie/ext/falcon-oozie-el-extension-0.4.0.2.0.6.0-76.jar
{oozie_libext_dir}'))
+    cmd3 += format(' && cp {falcon_home}/oozie/ext/falcon-oozie-el-extension-0.4.0.2.0.6.0-76.jar
{oozie_libext_dir}')
   # this is different for HDP1
   cmd4 = format("cd {oozie_tmp_dir} && /usr/lib/oozie/bin/oozie-setup.sh prepare-war")
   


Mime
View raw message