hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1577281 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/
Date Thu, 13 Mar 2014 18:55:29 GMT
Author: arp
Date: Thu Mar 13 18:55:29 2014
New Revision: 1577281

URL: http://svn.apache.org/r1577281
Log:
MAPREDUCE-5794. SliveMapper always uses default FileSystem. (Contributed by szetszwo)

Modified:
    hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
    hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DummyInputFormat.java
    hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveMapper.java
    hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SlivePartitioner.java
    hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveReducer.java

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1577281&r1=1577280&r2=1577281&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Thu Mar 13 18:55:29 2014
@@ -228,6 +228,9 @@ Release 2.4.0 - UNRELEASED
     MAPREDUCE-5789. Average Reduce time is incorrect on Job Overview page
     (Rushabh S Shah via jlowe)
 
+    MAPREDUCE-5794. SliveMapper always uses default FileSystem. (szetszwo via
+    Arpit Agarwal)
+
 Release 2.3.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DummyInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DummyInputFormat.java?rev=1577281&r1=1577280&r2=1577281&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DummyInputFormat.java
(original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DummyInputFormat.java
Thu Mar 13 18:55:29 2014
@@ -31,7 +31,6 @@ import org.apache.hadoop.mapred.Reporter
 /**
  * A input format which returns one dummy key and value
  */
-@SuppressWarnings("deprecation")
 class DummyInputFormat implements InputFormat<Object, Object> {
 
   static class EmptySplit implements InputSplit {

Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveMapper.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveMapper.java?rev=1577281&r1=1577280&r2=1577281&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveMapper.java
(original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveMapper.java
Thu Mar 13 18:55:29 2014
@@ -42,7 +42,6 @@ import org.apache.hadoop.util.StringUtil
  * that have been selected and upon operation completion output the collected
  * output from that operation (and repeat until finished).
  */
-@SuppressWarnings("deprecation")
 public class SliveMapper extends MapReduceBase implements
     Mapper<Object, Object, Text, Text> {
 
@@ -64,14 +63,9 @@ public class SliveMapper extends MapRedu
   @Override // MapReduceBase
   public void configure(JobConf conf) {
     try {
-      filesystem = FileSystem.get(conf);
-    } catch (Exception e) {
-      throw new RuntimeException(
-          "Unable to get the filesystem from provided configuration", e);
-    }
-    try {
       config = new ConfigExtractor(conf);
       ConfigExtractor.dumpOptions(config);
+      filesystem = config.getBaseDirectory().getFileSystem(conf);
     } catch (Exception e) {
       LOG.error("Unable to setup slive " + StringUtils.stringifyException(e));
       throw new RuntimeException("Unable to setup slive configuration", e);

Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SlivePartitioner.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SlivePartitioner.java?rev=1577281&r1=1577280&r2=1577281&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SlivePartitioner.java
(original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SlivePartitioner.java
Thu Mar 13 18:55:29 2014
@@ -26,7 +26,6 @@ import org.apache.hadoop.mapred.Partitio
  * The partition number is the hash of the operation type modular the total
  * number of the reducers.
  */
-@SuppressWarnings("deprecation")
 public class SlivePartitioner implements Partitioner<Text, Text> {
   @Override // JobConfigurable
   public void configure(JobConf conf) {}

Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveReducer.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveReducer.java?rev=1577281&r1=1577280&r2=1577281&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveReducer.java
(original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveReducer.java
Thu Mar 13 18:55:29 2014
@@ -35,7 +35,6 @@ import org.apache.hadoop.util.StringUtil
  * The slive reducer which iterates over the given input values and merges them
  * together into a final output value.
  */
-@SuppressWarnings("deprecation")
 public class SliveReducer extends MapReduceBase implements
     Reducer<Text, Text, Text, Text> {
 



Mime
View raw message