Author: vinodkv
Date: Sat Jul 27 18:50:27 2013
New Revision: 1507700
URL: http://svn.apache.org/r1507700
Log:
YARN-960. Fixed ResourceManager to propagate client-submitted credentials
irrespective of security. Contributed by Daryn Sharp.
Modified:
hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java
Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1507700&r1=1507699&r2=1507700&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Sat Jul 27 18:50:27 2013
@@ -754,6 +754,9 @@ Release 2.1.0-beta - 2013-07-02
YARN-688. Fixed NodeManager to properly cleanup containers when it is shut
down. (Jian He via vinodkv)
+ YARN-960. Fixed ResourceManager to propagate client-submitted credentials
+ irrespective of security. (Daryn Sharp via vinodkv)
+
BREAKDOWN OF HADOOP-8562/YARN-191 SUBTASKS AND RELATED JIRAS
YARN-158. Yarn creating package-info.java must not depend on sh.
Modified:
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java?rev=1507700&r1=1507699&r2=1507700&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java
(original)
+++
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java
Sat Jul 27 18:50:27 2013
@@ -216,16 +216,11 @@ public class AMLauncher implements Runna
applicationId).getMaxAppAttempts()));
Credentials credentials = new Credentials();
-
- if (UserGroupInformation.isSecurityEnabled()) {
- // TODO: Security enabled/disabled info should come from RM.
-
- DataInputByteBuffer dibb = new DataInputByteBuffer();
- if (container.getTokens() != null) {
- // TODO: Don't do this kind of checks everywhere.
- dibb.reset(container.getTokens());
- credentials.readTokenStorageStream(dibb);
- }
+ DataInputByteBuffer dibb = new DataInputByteBuffer();
+ if (container.getTokens() != null) {
+ // TODO: Don't do this kind of checks everywhere.
+ dibb.reset(container.getTokens());
+ credentials.readTokenStorageStream(dibb);
}
// Add AMRMToken
