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/12/17 09:08:00 UTC
ambari git commit: AMBARI-14414. 'Oozie' and 'Metrics Collector'
restart/start failed (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk f2e797abd -> 795450b37
AMBARI-14414. 'Oozie' and 'Metrics Collector' restart/start failed (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/795450b3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/795450b3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/795450b3
Branch: refs/heads/trunk
Commit: 795450b374e851e59e9c516dcd80726288f41c6b
Parents: f2e797a
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Dec 17 10:07:51 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Dec 17 10:07:51 2015 +0200
----------------------------------------------------------------------
.../src/main/python/resource_management/core/providers/system.py | 1 +
.../common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/795450b3/ambari-common/src/main/python/resource_management/core/providers/system.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/core/providers/system.py b/ambari-common/src/main/python/resource_management/core/providers/system.py
index 5066fa8..50b99cf 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/system.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/system.py
@@ -41,6 +41,7 @@ def assert_not_safemode_folder(path, safemode_folders):
def _ensure_metadata(path, user, group, mode=None, cd_access=None, recursive_ownership=False, recursive_mode_flags=None, recursion_follow_links=False, safemode_folders=[]):
user_entity = group_entity = None
+ _user_entity = _group_entity = None
if user or group:
stat = sudo.stat(path)
http://git-wip-us.apache.org/repos/asf/ambari/blob/795450b3/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 b35eec0..db1b224 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
@@ -222,7 +222,7 @@ def oozie_server_specific():
)
Directory(params.oozie_webapps_conf_dir,
- user = params.oozie_user,
+ owner = params.oozie_user,
group = params.user_group,
recursive_ownership = True,
recursion_follow_links = True,