Repository: ambari
Updated Branches:
  refs/heads/trunk a23fbd763 -> a4e72f648


Revert "AMBARI-16360. RM fails to start after adding services in Kerb'd cluster"

This reverts commit f83e258dad0e5417d816f0d41d8189fedac1efe7.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a4e72f64
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a4e72f64
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a4e72f64

Branch: refs/heads/trunk
Commit: a4e72f648357a58987fcfab1d078feb1e3558e3f
Parents: a23fbd7
Author: Robert Levas <[email protected]>
Authored: Wed May 11 12:47:41 2016 -0400
Committer: Robert Levas <[email protected]>
Committed: Wed May 11 12:47:41 2016 -0400

----------------------------------------------------------------------
 .../YARN/2.1.0.2.0/package/scripts/resourcemanager.py           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a4e72f64/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py
 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py
index 2166202..7ca54cc 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py
+++ 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py
@@ -235,7 +235,10 @@ class ResourcemanagerDefault(Resourcemanager):
     ignored_dfs_dirs = 
HdfsResourceProvider.get_ignored_resources_list(params.hdfs_resource_ignore_file)
 
     if params.security_enabled:
-      Execute(format("{yarn_timelineservice_kinit_cmd}"), 
user=params.yarn_user)
+      Execute(
+        format("{rm_kinit_cmd}")
+        , user=params.yarn_user
+      )
 
     for dir_path in dirs:
       self.wait_for_dfs_directory_created(dir_path, ignored_dfs_dirs)

Reply via email to