Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-960. Fixed ResourceManager to propagate client-submitted credentials irrespective of security. Contributed by Daryn Sharp. 

svn merge --ignore-ancestry -c 1507700 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507701 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2013-07-27 18:51:01 +00:00
parent 3c08e71316
commit 72a08508c9
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -739,6 +739,9 @@ Release 2.1.0-beta - 2013-07-02
YARN-688. Fixed NodeManager to properly cleanup containers when it is shut YARN-688. Fixed NodeManager to properly cleanup containers when it is shut
down. (Jian He via vinodkv) 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 BREAKDOWN OF HADOOP-8562/YARN-191 SUBTASKS AND RELATED JIRAS
YARN-158. Yarn creating package-info.java must not depend on sh. YARN-158. Yarn creating package-info.java must not depend on sh.

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/AMLauncher.java
View File

@ -216,17 +216,12 @@ public class AMLauncher implements Runnable {
applicationId).getMaxAppAttempts())); applicationId).getMaxAppAttempts()));
Credentials credentials = new Credentials(); Credentials credentials = new Credentials();
if (UserGroupInformation.isSecurityEnabled()) {
// TODO: Security enabled/disabled info should come from RM.
DataInputByteBuffer dibb = new DataInputByteBuffer(); DataInputByteBuffer dibb = new DataInputByteBuffer();
if (container.getTokens() != null) { if (container.getTokens() != null) {
// TODO: Don't do this kind of checks everywhere. // TODO: Don't do this kind of checks everywhere.
dibb.reset(container.getTokens()); dibb.reset(container.getTokens());
credentials.readTokenStorageStream(dibb); credentials.readTokenStorageStream(dibb);
} }
}
// Add AMRMToken // Add AMRMToken
Token<AMRMTokenIdentifier> amrmToken = application.getAMRMToken(); Token<AMRMTokenIdentifier> amrmToken = application.getAMRMToken();