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

svn merge -c 1331046. FIXES: MAPREDUCE-4189. TestContainerManagerSecurity is failing (Devaraj K via bobby) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331048 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Joseph Evans 2012-04-26 19:44:22 +00:00
parent e5e15fab74
commit da0f9645a0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -309,6 +309,9 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-4169. Container Logs appear in unsorted order (Jonathan Eagles MAPREDUCE-4169. Container Logs appear in unsorted order (Jonathan Eagles
via bobby) via bobby)
MAPREDUCE-4189. TestContainerManagerSecurity is failing (Devaraj K via
bobby)
Release 0.23.2 - UNRELEASED Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java
View File

@ -47,6 +47,7 @@ import org.apache.hadoop.io.DataInputBuffer;
import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Text;
import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.AccessControlException; import org.apache.hadoop.security.AccessControlException;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.yarn.api.AMRMProtocol; import org.apache.hadoop.yarn.api.AMRMProtocol;
@ -401,6 +402,7 @@ public class TestContainerManagerSecurity {
appToken.setService(new Text(schedulerAddr.getHostName() + ":" appToken.setService(new Text(schedulerAddr.getHostName() + ":"
+ schedulerAddr.getPort())); + schedulerAddr.getPort()));
currentUser.addToken(appToken); currentUser.addToken(appToken);
SecurityUtil.setTokenService(appToken, schedulerAddr);
AMRMProtocol scheduler = currentUser AMRMProtocol scheduler = currentUser
.doAs(new PrivilegedAction<AMRMProtocol>() { .doAs(new PrivilegedAction<AMRMProtocol>() {