ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-13793 Resource Manager (HA) fails to start after enabling Kerberos (dsen)
Date Wed, 11 Nov 2015 20:39:02 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1.2 7b0c365e9 -> fcce9ecbc


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/fcce9ecb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fcce9ecb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fcce9ecb

Branch: refs/heads/branch-2.1.2
Commit: fcce9ecbc7533179500d8f2b2caebaf631b2c832
Parents: 7b0c365
Author: Dmytro Sen <dsen@apache.org>
Authored: Mon Nov 9 20:57:41 2015 +0200
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Wed Nov 11 12:08:26 2015 -0800

----------------------------------------------------------------------
 .../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/fcce9ecb/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 9b242ea..08b8738 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
@@ -122,9 +122,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/fcce9ecb/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 542a5fe..e482082 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
@@ -223,18 +223,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/fcce9ecb/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 fb7d847..428655b 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',


Mime
View raw message