Updated Branches: refs/heads/sqoop2 a52993a93 -> b1fcbc9d9
SQOOP-1002: Sqoop2: Mapreduce local mode detection is not working correctly on Hadoop 2.x (Jarek Jarcec Cecho via Kate Ting) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/b1fcbc9d Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/b1fcbc9d Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/b1fcbc9d Branch: refs/heads/sqoop2 Commit: b1fcbc9d934e33a9579a4a5aa0a93968645bc4d6 Parents: a52993a Author: Kate Ting <[email protected]> Authored: Sat May 11 21:22:20 2013 -0400 Committer: Kate Ting <[email protected]> Committed: Sat May 11 21:22:20 2013 -0400 ---------------------------------------------------------------------- .../mapreduce/MapreduceSubmissionEngine.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/b1fcbc9d/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionEngine.java ---------------------------------------------------------------------- diff --git a/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionEngine.java b/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionEngine.java index 02db365..0e8c9f7 100644 --- a/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionEngine.java +++ b/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionEngine.java @@ -424,6 +424,12 @@ public class MapreduceSubmissionEngine extends SubmissionEngine { * @return True if we're running in local mode */ private boolean isLocal() { + // If framework is set to YARN, then we can't be running in local mode + if("yarn".equals(globalConfiguration.get("mapreduce.framework.name"))) { + return false; + } + + // If job tracker address is "local" then we're running in local mode return "local".equals(globalConfiguration.get("mapreduce.jobtracker.address")) || "local".equals(globalConfiguration.get("mapred.job.tracker")); }
