Author: szetszwo
Date: Thu Mar 6 21:43:13 2014
New Revision: 1575056
URL: http://svn.apache.org/r1575056
Log:
svn merge -c 1575049 from trunk for MAPREDUCE-5780. SliveTest should use the
specified path to get the particular FileSystem instead of using the default
FileSystem.
Modified:
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/ (props
changed)
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveTest.java
Propchange: hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1575049
Modified: hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt?rev=1575056&r1=1575055&r2=1575056&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt Thu
Mar 6 21:43:13 2014
@@ -45,6 +45,9 @@ Release 2.4.0 - UNRELEASED
MAPREDUCE-5768. TestMRJobs.testContainerRollingLog fails on trunk (Gera
Shegalov via jlowe)
+ MAPREDUCE-5780. SliveTest should use the specified path to get the
+ particular FileSystem instead of using the default FileSystem. (szetszwo)
+
Release 2.3.1 - UNRELEASED
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1575049
Modified:
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveTest.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveTest.java?rev=1575056&r1=1575055&r2=1575056&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveTest.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveTest.java
Thu Mar 6 21:43:13 2014
@@ -58,7 +58,6 @@ import org.apache.hadoop.util.ToolRunner
* The number of maps is specified by "slive.maps".
* The number of reduces is specified by "slive.reduces".
*/
-@SuppressWarnings("deprecation")
public class SliveTest implements Tool {
private static final Log LOG = LogFactory.getLog(SliveTest.class);
@@ -221,7 +220,7 @@ public class SliveTest implements Tool {
private void writeReport(ConfigExtractor cfg) throws Exception {
Path dn = cfg.getOutputPath();
LOG.info("Writing report using contents of " + dn);
- FileSystem fs = FileSystem.get(cfg.getConfig());
+ FileSystem fs = dn.getFileSystem(cfg.getConfig());
FileStatus[] reduceFiles = fs.listStatus(dn);
BufferedReader fileReader = null;
PrintWriter reportWriter = null;
@@ -292,10 +291,10 @@ public class SliveTest implements Tool {
* @throws IOException
*/
private void cleanup(ConfigExtractor cfg) throws IOException {
- FileSystem fs = FileSystem.get(cfg.getConfig());
Path base = cfg.getBaseDirectory();
if (base != null) {
LOG.info("Attempting to recursively delete " + base);
+ FileSystem fs = base.getFileSystem(cfg.getConfig());
fs.delete(base, true);
}
}
