You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/11/09 19:58:07 UTC
ambari git commit: AMBARI-13793 Resource Manager (HA) fails to start
after enabling Kerberos (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 9c086c303 -> 4cccb8708
AMBARI-13793 Resource Manager (HA) fails to start after enabling Kerberos (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4cccb870
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4cccb870
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4cccb870
Branch: refs/heads/trunk
Commit: 4cccb8708a37de5a83ced70565ccdb1103fc30e6
Parents: 9c086c3
Author: Dmytro Sen <ds...@apache.org>
Authored: Mon Nov 9 20:57:41 2015 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Mon Nov 9 20:57:41 2015 +0200
----------------------------------------------------------------------
.../YARN/2.1.0.2.0/package/scripts/params_linux.py | 3 ---
.../YARN/2.1.0.2.0/package/scripts/yarn.py | 12 ------------
.../python/stacks/2.0.6/YARN/test_resourcemanager.py | 6 ------
3 files changed, 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4cccb870/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
index a02a84d..f608b08 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
@@ -121,9 +121,6 @@ security_enabled = config['configurations']['cluster-env']['security_enabled']
nm_security_marker = '/var/lib/hadoop-yarn/nm_security_enabled'
current_nm_security_state = os.path.isfile(nm_security_marker)
toggle_nm_security = (current_nm_security_state and not security_enabled) or (not current_nm_security_state and security_enabled)
-rm_security_marker = "/var/lib/hadoop-yarn/rm_security_enabled"
-current_rm_security_state = os.path.isfile(rm_security_marker)
-toggle_rm_security = (current_rm_security_state and not security_enabled) or (not current_rm_security_state and security_enabled)
smoke_user_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
yarn_executor_container_group = config['configurations']['yarn-site']['yarn.nodemanager.linux-container-executor.group']
yarn_nodemanager_container_executor_class = config['configurations']['yarn-site']['yarn.nodemanager.container-executor.class']
http://git-wip-us.apache.org/repos/asf/ambari/blob/4cccb870/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
index 4d5cb9b..451976f 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
@@ -230,18 +230,6 @@ def yarn(name = None):
mode=0700
)
params.HdfsResource(None, action="execute")
- if params.toggle_rm_security:
- Execute('yarn resourcemanager -format-state-store', user = params.yarn_user,
- )
- # Setting RM marker file
- if params.security_enabled:
- File(params.rm_security_marker,
- content="Marker file to track first start after enabling/disabling security. "
- "During first start ResourceManager state store is formatted"
- )
- elif not params.security_enabled:
- File(params.rm_security_marker, action="delete")
-
elif name == 'apptimelineserver':
http://git-wip-us.apache.org/repos/asf/ambari/blob/4cccb870/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
index 4639bd4..80492b4 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
@@ -434,12 +434,6 @@ class TestResourceManager(RMFTestCase):
owner = 'yarn',
group = 'hadoop',
)
- self.assertResourceCalled('Execute', 'yarn resourcemanager -format-state-store',
- user = 'yarn',
- )
- self.assertResourceCalled('File', '/var/lib/hadoop-yarn/rm_security_enabled',
- content = 'Marker file to track first start after enabling/disabling security. During first start ResourceManager state store is formatted',
- )
self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude',
owner = 'yarn',
group = 'hadoop',