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 2015/03/09 13:53:55 UTC
[1/2] ambari git commit: AMBARI-9983. OOZIE could not start on
CentOS6 (UMASK-027) (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 e6c791aff -> e1dab5335
refs/heads/trunk c095bd911 -> e671f631b
AMBARI-9983. OOZIE could not start on CentOS6 (UMASK-027) (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e671f631
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e671f631
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e671f631
Branch: refs/heads/trunk
Commit: e671f631bb9a4bba0663c4d514185185b89a90db
Parents: c095bd9
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Mar 9 14:43:46 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Mar 9 14:43:46 2015 +0200
----------------------------------------------------------------------
.../common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py | 2 +-
.../src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e671f631/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index 82a76aa..c0f6c3a 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -218,6 +218,6 @@ def oozie_server_specific():
group = params.user_group,
mode = 0664
)
- Execute(('chown', '-R', params.oozie_user, params.user_group, params.oozie_server_dir),
+ Execute(('chown', '-R', format("{oozie_user}:{user_group}"), params.oozie_server_dir),
sudo=True
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/e671f631/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
index 4ae5112..dc4bc7f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
@@ -217,7 +217,7 @@ class TestOozieServer(RMFTestCase):
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
user = 'oozie',
)
- self.assertResourceCalled('Execute', ('chown', '-R', u'oozie', u'hadoop', '/var/lib/oozie/oozie-server'),
+ self.assertResourceCalled('Execute', ('chown', '-R', u'oozie:hadoop', '/var/lib/oozie/oozie-server'),
sudo = True,
)
@@ -474,7 +474,7 @@ class TestOozieServer(RMFTestCase):
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
user = 'oozie',
)
- self.assertResourceCalled('Execute', ('chown', '-R', u'oozie', u'hadoop', '/var/lib/oozie/oozie-server'),
+ self.assertResourceCalled('Execute', ('chown', '-R', u'oozie:hadoop', '/var/lib/oozie/oozie-server'),
sudo = True,
)
@@ -630,7 +630,7 @@ class TestOozieServer(RMFTestCase):
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
user = 'oozie',
)
- self.assertResourceCalled('Execute', ('chown', '-R', u'oozie', u'hadoop', '/var/lib/oozie/oozie-server'),
+ self.assertResourceCalled('Execute', ('chown', '-R', u'oozie:hadoop', '/var/lib/oozie/oozie-server'),
sudo = True,
)
[2/2] ambari git commit: AMBARI-9983. OOZIE could not start on
CentOS6 (UMASK-027) (aonishuk)
Posted by ao...@apache.org.
AMBARI-9983. OOZIE could not start on CentOS6 (UMASK-027) (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e1dab533
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e1dab533
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e1dab533
Branch: refs/heads/branch-2.0.0
Commit: e1dab53355a548e2f4fd92b9f5e0f7bef1c62923
Parents: e6c791a
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Mar 9 14:43:49 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Mar 9 14:43:49 2015 +0200
----------------------------------------------------------------------
.../common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py | 2 +-
.../src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1dab533/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index 82a76aa..c0f6c3a 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -218,6 +218,6 @@ def oozie_server_specific():
group = params.user_group,
mode = 0664
)
- Execute(('chown', '-R', params.oozie_user, params.user_group, params.oozie_server_dir),
+ Execute(('chown', '-R', format("{oozie_user}:{user_group}"), params.oozie_server_dir),
sudo=True
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1dab533/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
index 4ae5112..dc4bc7f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
@@ -217,7 +217,7 @@ class TestOozieServer(RMFTestCase):
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
user = 'oozie',
)
- self.assertResourceCalled('Execute', ('chown', '-R', u'oozie', u'hadoop', '/var/lib/oozie/oozie-server'),
+ self.assertResourceCalled('Execute', ('chown', '-R', u'oozie:hadoop', '/var/lib/oozie/oozie-server'),
sudo = True,
)
@@ -474,7 +474,7 @@ class TestOozieServer(RMFTestCase):
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
user = 'oozie',
)
- self.assertResourceCalled('Execute', ('chown', '-R', u'oozie', u'hadoop', '/var/lib/oozie/oozie-server'),
+ self.assertResourceCalled('Execute', ('chown', '-R', u'oozie:hadoop', '/var/lib/oozie/oozie-server'),
sudo = True,
)
@@ -630,7 +630,7 @@ class TestOozieServer(RMFTestCase):
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
user = 'oozie',
)
- self.assertResourceCalled('Execute', ('chown', '-R', u'oozie', u'hadoop', '/var/lib/oozie/oozie-server'),
+ self.assertResourceCalled('Execute', ('chown', '-R', u'oozie:hadoop', '/var/lib/oozie/oozie-server'),
sudo = True,
)