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

merge -r 1297661:1297662 from trunk to branch-0.23. FIXES: MAPREDUCE-3974 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299773 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-03-12 18:27:35 +00:00
parent 4e0d95988f
commit 275323b42f
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,9 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-3348. Fixed a bug in MR client to redirect to JobHistoryServer
correctly when RM forgets the app. (Devaraj K via vinodkv)
MAPREDUCE-3974. TestSubmitJob in MR1 tests doesn't compile after HDFS-162
merge. (atm)
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES

27
hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestSubmitJob.java
View File

@ -32,9 +32,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.protocol.HdfsFileStatus;
import org.apache.hadoop.hdfs.protocolPB.ClientNamenodeProtocolTranslatorPB;
import org.apache.hadoop.hdfs.server.namenode.NameNode;
import org.apache.hadoop.ipc.RPC;
import org.apache.hadoop.ipc.RemoteException;
import org.apache.hadoop.mapreduce.MRConfig;
@ -147,12 +144,6 @@ public class TestSubmitJob {
ClientProtocol.versionID, JobTracker.getAddress(conf), ugi,
conf, NetUtils.getSocketFactory(conf, ClientProtocol.class));
}
static org.apache.hadoop.hdfs.protocol.ClientProtocol getDFSClient(
Configuration conf, UserGroupInformation ugi) throws IOException {
return new ClientNamenodeProtocolTranslatorPB(NameNode.getAddress(conf),
conf, ugi);
}
/**
* Submit a job and check if the files are accessible to other users.
@ -219,16 +210,21 @@ public class TestSubmitJob {
// create user2
UserGroupInformation user2 =
TestMiniMRWithDFSWithDistinctUsers.createUGI("user2", false);
JobConf conf_other = mr.createJobConf();
org.apache.hadoop.hdfs.protocol.ClientProtocol client =
getDFSClient(conf_other, user2);
final JobConf conf_other = mr.createJobConf();
FileSystem fs2 = user2.doAs(new PrivilegedExceptionAction<FileSystem>() {
@Override
public FileSystem run() throws Exception {
return FileSystem.get(conf_other);
}
});
// try accessing mapred.system.dir/jobid/*
try {
String path = new URI(jt.getSystemDir()).getPath();
Path path = new Path(jt.getSystemDir());
LOG.info("Try listing the mapred-system-dir as the user ("
+ user2.getUserName() + ")");
client.getListing(path, HdfsFileStatus.EMPTY_NAME, false);
fs2.listStatus(path);
fail("JobTracker system dir is accessible to others");
} catch (IOException ioe) {
assertTrue(ioe.toString(),
@ -241,8 +237,7 @@ public class TestSubmitJob {
try {
LOG.info("Try accessing the job folder for job " + id + " as the user ("
+ user2.getUserName() + ")");
client.getListing(jobSubmitDirpath.toUri().getPath(),
HdfsFileStatus.EMPTY_NAME, false);
fs2.listStatus(jobSubmitDirpath);
fail("User's staging folder is accessible to others");
} catch (IOException ioe) {
assertTrue(ioe.toString(),