From 763b8ebf46ea2c42ad63285cff61b77e7e24185c Mon Sep 17 00:00:00 2001
From: Arpit Agarwal <arp@apache.org>
Date: Thu, 13 Mar 2014 18:55:29 +0000
Subject: [PATCH] MAPREDUCE-5794. SliveMapper always uses default FileSystem.
 (Contributed by szetszwo)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1577281 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt                      | 3 +++
 .../java/org/apache/hadoop/fs/slive/DummyInputFormat.java | 1 -
 .../test/java/org/apache/hadoop/fs/slive/SliveMapper.java | 8 +-------
 .../java/org/apache/hadoop/fs/slive/SlivePartitioner.java | 1 -
 .../java/org/apache/hadoop/fs/slive/SliveReducer.java     | 1 -
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 0ffbba7adb4..2705eb196d4 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -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
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DummyInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DummyInputFormat.java
index 080a8e1b8b7..a399a506e3b 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DummyInputFormat.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/DummyInputFormat.java
@@ -31,7 +31,6 @@
 /**
  * A input format which returns one dummy key and value
  */
-@SuppressWarnings("deprecation")
 class DummyInputFormat implements InputFormat<Object, Object> {
 
   static class EmptySplit implements InputSplit {
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveMapper.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveMapper.java
index 584e07b82d0..e02c5d9b07d 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveMapper.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveMapper.java
@@ -42,7 +42,6 @@
  * 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> {
 
@@ -63,15 +62,10 @@ public class SliveMapper extends MapReduceBase implements
    */
   @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);
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SlivePartitioner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SlivePartitioner.java
index 4016124afbe..93bd888304c 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SlivePartitioner.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SlivePartitioner.java
@@ -26,7 +26,6 @@
  * 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) {}
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveReducer.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveReducer.java
index 4dcba6f4855..323559cd208 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveReducer.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/slive/SliveReducer.java
@@ -35,7 +35,6 @@
  * 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> {