You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2013/12/16 17:50:40 UTC
git commit: AMBARI-4083. Fix Oozie fails on Python
Updated Branches:
refs/heads/trunk c54e6cd33 -> a46cb311b
AMBARI-4083. Fix Oozie fails on Python
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a46cb311
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a46cb311
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a46cb311
Branch: refs/heads/trunk
Commit: a46cb311b8e8097ae4eded083467545893ce7579
Parents: c54e6cd
Author: Andrew Onischuk <ao...@hortonworks.com>
Authored: Mon Dec 16 08:42:14 2013 -0800
Committer: Andrew Onischuk <ao...@hortonworks.com>
Committed: Mon Dec 16 08:49:21 2013 -0800
----------------------------------------------------------------------
.../HDP/2.0._/services/OOZIE/package/scripts/oozie_client.py | 2 +-
.../HDP/2.0._/services/OOZIE/package/scripts/oozie_server.py | 4 +---
.../stacks/HDP/2.0._/services/YARN/package/scripts/yarn.py | 6 ++----
3 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a46cb311/ambari-server/src/main/resources/stacks/HDP/2.0._/services/OOZIE/package/scripts/oozie_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/OOZIE/package/scripts/oozie_client.py b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/OOZIE/package/scripts/oozie_client.py
index a70ad62..1d5db39 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/OOZIE/package/scripts/oozie_client.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/OOZIE/package/scripts/oozie_client.py
@@ -7,7 +7,7 @@ from oozie_service import oozie_service
class OozieClient(Script):
def install(self, env):
- Package('oozie-client.noarch')
+ self.install_packages(env)
self.configure(env)
def configure(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/a46cb311/ambari-server/src/main/resources/stacks/HDP/2.0._/services/OOZIE/package/scripts/oozie_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/OOZIE/package/scripts/oozie_server.py b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/OOZIE/package/scripts/oozie_server.py
index 7a342c6..0c4c46b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/OOZIE/package/scripts/oozie_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/OOZIE/package/scripts/oozie_server.py
@@ -7,9 +7,7 @@ from oozie_service import oozie_service
class OozieServer(Script):
def install(self, env):
- Package('oozie.noarch')
- Package('oozie-client.noarch')
- Package('extjs-2.2-1')
+ self.install_packages(env)
self.configure(env)
def configure(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/a46cb311/ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/yarn.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/yarn.py b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/yarn.py
index ea7b8d0..1d97373 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/yarn.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0._/services/YARN/package/scripts/yarn.py
@@ -114,11 +114,9 @@ def yarn():
container_executor = format("{yarn_container_bin}/container-executor")
File(container_executor,
group=params.yarn_executor_container_group,
- mode=6050
+ mode=06050
)
-
- Execute(format("chmod 6050 {yarn_container_bin}/container-executor")) #Fix File permission setting
-
+
File(format("{config_dir}/container-executor.cfg"),
group=params.user_group,
mode=0644,