[hadoop] Git Push Summary

2017-11-02 Thread aajisaka
Repository: hadoop
Updated Branches:
  refs/heads/official [deleted] bfa6891e7

-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org



hadoop git commit: addendum patch for YARN-7289.

2017-11-02 Thread rohithsharmaks
Repository: hadoop
Updated Branches:
  refs/heads/trunk 0cc98ae0e -> 940ffe3f9


addendum patch for YARN-7289.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/940ffe3f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/940ffe3f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/940ffe3f

Branch: refs/heads/trunk
Commit: 940ffe3f9ce74286a8863e3743faf88a33c817a3
Parents: 0cc98ae
Author: Rohith Sharma K S 
Authored: Thu Nov 2 13:55:19 2017 +0530
Committer: Rohith Sharma K S 
Committed: Thu Nov 2 13:55:19 2017 +0530

--
 .../scheduler/AbstractYarnScheduler.java|  4 ++--
 .../scheduler/capacity/CapacityScheduler.java   |  2 +-
 .../rmapp/TestApplicationLifetimeMonitor.java   | 24 +++-
 3 files changed, 16 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/940ffe3f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
index f2da1fe..8ce6eb8 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
@@ -1351,8 +1351,8 @@ public abstract class AbstractYarnScheduler
 
   @Override
   public long checkAndGetApplicationLifetime(String queueName, long lifetime) {
-// -1 indicates, lifetime is not configured.
-return -1;
+// Lifetime is the application lifetime by default.
+return lifetime;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/940ffe3f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
index d91aa55..ca289b1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
@@ -2591,7 +2591,7 @@ public class CapacityScheduler extends
   long maximumApplicationLifetime =
   ((LeafQueue) queue).getMaximumApplicationLifetime();
 
-  // check only for maximum, that's enough because default cann't
+  // check only for maximum, that's enough because default can't
   // exceed maximum
   if (maximumApplicationLifetime <= 0) {
 return lifetimeRequestedByApp;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/940ffe3f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
index 4f88480..e1d8716 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-r

hadoop git commit: addendum patch for YARN-7289.

2017-11-02 Thread rohithsharmaks
Repository: hadoop
Updated Branches:
  refs/heads/branch-3.0 be7cfe57f -> 9efe9bd3d


addendum patch for YARN-7289.

(cherry picked from commit 940ffe3f9ce74286a8863e3743faf88a33c817a3)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9efe9bd3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9efe9bd3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9efe9bd3

Branch: refs/heads/branch-3.0
Commit: 9efe9bd3d825a5055f68661dabf084df2eddd0f2
Parents: be7cfe5
Author: Rohith Sharma K S 
Authored: Thu Nov 2 13:55:19 2017 +0530
Committer: Rohith Sharma K S 
Committed: Thu Nov 2 14:02:48 2017 +0530

--
 .../scheduler/AbstractYarnScheduler.java|  4 ++--
 .../scheduler/capacity/CapacityScheduler.java   |  2 +-
 .../rmapp/TestApplicationLifetimeMonitor.java   | 24 +++-
 3 files changed, 16 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/9efe9bd3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
index 211c9f6..a44d13c 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
@@ -1356,8 +1356,8 @@ public abstract class AbstractYarnScheduler
 
   @Override
   public long checkAndGetApplicationLifetime(String queueName, long lifetime) {
-// -1 indicates, lifetime is not configured.
-return -1;
+// Lifetime is the application lifetime by default.
+return lifetime;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9efe9bd3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
index d91aa55..ca289b1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
@@ -2591,7 +2591,7 @@ public class CapacityScheduler extends
   long maximumApplicationLifetime =
   ((LeafQueue) queue).getMaximumApplicationLifetime();
 
-  // check only for maximum, that's enough because default cann't
+  // check only for maximum, that's enough because default can't
   // exceed maximum
   if (maximumApplicationLifetime <= 0) {
 return lifetimeRequestedByApp;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9efe9bd3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
index 4f88480..e1d8716 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.jav

hadoop git commit: addendum patch for YARN-7289.

2017-11-02 Thread rohithsharmaks
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 d1f8854a1 -> e53fcd52e


addendum patch for YARN-7289.

(cherry picked from commit 940ffe3f9ce74286a8863e3743faf88a33c817a3)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e53fcd52
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e53fcd52
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e53fcd52

Branch: refs/heads/branch-2
Commit: e53fcd52eec36b06ac69e1a88f11ce2868328d47
Parents: d1f8854
Author: Rohith Sharma K S 
Authored: Thu Nov 2 13:55:19 2017 +0530
Committer: Rohith Sharma K S 
Committed: Thu Nov 2 14:07:28 2017 +0530

--
 .../scheduler/AbstractYarnScheduler.java|  4 ++--
 .../scheduler/capacity/CapacityScheduler.java   |  2 +-
 .../rmapp/TestApplicationLifetimeMonitor.java   | 24 +++-
 3 files changed, 16 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e53fcd52/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
index 5b6fdc6..3e41da7 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
@@ -1327,8 +1327,8 @@ public abstract class AbstractYarnScheduler
 
   @Override
   public long checkAndGetApplicationLifetime(String queueName, long lifetime) {
-// -1 indicates, lifetime is not configured.
-return -1;
+// Lifetime is the application lifetime by default.
+return lifetime;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e53fcd52/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
index 6e7b8a8..d472d35 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
@@ -2592,7 +2592,7 @@ public class CapacityScheduler extends
   long maximumApplicationLifetime =
   ((LeafQueue) queue).getMaximumApplicationLifetime();
 
-  // check only for maximum, that's enough because default cann't
+  // check only for maximum, that's enough because default can't
   // exceed maximum
   if (maximumApplicationLifetime <= 0) {
 return lifetimeRequestedByApp;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e53fcd52/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
index b1da9af..037ed99 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
++

[3/3] hadoop git commit: MAPREDUCE-6983. Moving logging APIs over to slf4j in hadoop-mapreduce-client-core. Contributed by Jinjiang Ling.

2017-11-02 Thread aajisaka
MAPREDUCE-6983. Moving logging APIs over to slf4j in 
hadoop-mapreduce-client-core. Contributed by Jinjiang Ling.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/178751ed
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/178751ed
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/178751ed

Branch: refs/heads/trunk
Commit: 178751ed8c9d47038acf8616c226f1f52e884feb
Parents: 940ffe3
Author: Akira Ajisaka 
Authored: Thu Nov 2 17:42:52 2017 +0900
Committer: Akira Ajisaka 
Committed: Thu Nov 2 17:43:08 2017 +0900

--
 .../org/apache/hadoop/mapred/BackupStore.java |  7 ---
 .../org/apache/hadoop/mapred/CleanupQueue.java|  8 
 .../java/org/apache/hadoop/mapred/Counters.java   |  4 ++--
 .../DeprecatedQueueConfigurationParser.java   |  8 
 .../org/apache/hadoop/mapred/FileInputFormat.java |  8 
 .../apache/hadoop/mapred/FileOutputCommitter.java |  6 +++---
 .../main/java/org/apache/hadoop/mapred/IFile.java |  6 +++---
 .../apache/hadoop/mapred/IFileInputStream.java|  7 ---
 .../java/org/apache/hadoop/mapred/IndexCache.java |  6 +++---
 .../org/apache/hadoop/mapred/JobACLsManager.java  |  6 +++---
 .../java/org/apache/hadoop/mapred/JobConf.java|  6 +++---
 .../org/apache/hadoop/mapred/JobEndNotifier.java  |  8 
 .../java/org/apache/hadoop/mapred/JvmContext.java |  8 
 .../apache/hadoop/mapred/LineRecordReader.java|  8 
 .../java/org/apache/hadoop/mapred/MapTask.java|  7 ---
 .../java/org/apache/hadoop/mapred/Merger.java |  6 +++---
 .../main/java/org/apache/hadoop/mapred/Queue.java | 10 +-
 .../hadoop/mapred/QueueConfigurationParser.java   |  8 
 .../org/apache/hadoop/mapred/QueueManager.java|  6 +++---
 .../java/org/apache/hadoop/mapred/ReduceTask.java |  9 +
 .../org/apache/hadoop/mapred/SortedRanges.java|  8 
 .../main/java/org/apache/hadoop/mapred/Task.java  | 18 +-
 .../java/org/apache/hadoop/mapred/TaskLog.java| 11 +--
 .../java/org/apache/hadoop/mapred/TaskStatus.java |  8 
 .../org/apache/hadoop/mapred/jobcontrol/Job.java  |  6 +++---
 .../mapred/lib/FieldSelectionMapReduce.java   |  7 ---
 .../apache/hadoop/mapred/lib/InputSampler.java|  6 +++---
 .../hadoop/mapred/lib/MultithreadedMapRunner.java |  8 
 .../apache/hadoop/mapred/pipes/Application.java   |  7 ---
 .../hadoop/mapred/pipes/BinaryProtocol.java   |  8 
 .../apache/hadoop/mapred/pipes/PipesReducer.java  |  7 ---
 .../org/apache/hadoop/mapred/pipes/Submitter.java |  6 +++---
 .../java/org/apache/hadoop/mapreduce/Cluster.java |  7 ---
 .../org/apache/hadoop/mapreduce/CryptoUtils.java  |  6 +++---
 .../java/org/apache/hadoop/mapreduce/Job.java |  6 +++---
 .../hadoop/mapreduce/JobResourceUploader.java |  7 ---
 .../hadoop/mapreduce/JobSubmissionFiles.java  |  7 ---
 .../org/apache/hadoop/mapreduce/JobSubmitter.java | 11 +--
 .../mapreduce/counters/AbstractCounters.java  |  7 ---
 .../counters/FileSystemCounterGroup.java  |  7 ---
 .../mapreduce/counters/FrameworkCounterGroup.java |  7 ---
 .../hadoop/mapreduce/jobhistory/EventWriter.java  |  8 
 .../mapreduce/jobhistory/JobHistoryParser.java|  7 ---
 .../mapreduce/lib/db/BigDecimalSplitter.java  |  7 ---
 .../hadoop/mapreduce/lib/db/DBInputFormat.java|  7 ---
 .../hadoop/mapreduce/lib/db/DBOutputFormat.java   |  7 ---
 .../hadoop/mapreduce/lib/db/DBRecordReader.java   |  7 ---
 .../mapreduce/lib/db/DataDrivenDBInputFormat.java |  7 ---
 .../lib/db/DataDrivenDBRecordReader.java  |  7 ---
 .../hadoop/mapreduce/lib/db/DateSplitter.java |  6 +++---
 .../hadoop/mapreduce/lib/db/FloatSplitter.java|  7 ---
 .../mapreduce/lib/db/OracleDBRecordReader.java|  7 ---
 .../lib/db/OracleDataDrivenDBInputFormat.java |  3 ---
 .../hadoop/mapreduce/lib/db/TextSplitter.java |  6 +++---
 .../lib/fieldsel/FieldSelectionMapper.java|  7 ---
 .../lib/fieldsel/FieldSelectionReducer.java   |  7 ---
 .../lib/input/CombineFileInputFormat.java |  7 ---
 .../mapreduce/lib/input/FileInputFormat.java  |  7 ---
 .../lib/input/FixedLengthRecordReader.java|  8 
 .../mapreduce/lib/input/LineRecordReader.java |  7 ---
 .../lib/input/SequenceFileInputFilter.java|  9 +
 .../mapreduce/lib/jobcontrol/ControlledJob.java   |  7 ---
 .../mapreduce/lib/jobcontrol/JobControl.java  |  6 +++---
 .../mapreduce/lib/map/MultithreadedMapper.java|  7 ---
 .../mapreduce/lib/output/FileOutputCommitter.java |  7 ---
 .../lib/output/PartialFileOutputCommitter.java|  8 
 .../mapreduce/lib/partition/InputSampler.java |  6 +++---
 .../lib/partition/Key

[1/3] hadoop git commit: MAPREDUCE-6983. Moving logging APIs over to slf4j in hadoop-mapreduce-client-core. Contributed by Jinjiang Ling.

2017-11-02 Thread aajisaka
Repository: hadoop
Updated Branches:
  refs/heads/trunk 940ffe3f9 -> 178751ed8


http://git-wip-us.apache.org/repos/asf/hadoop/blob/178751ed/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestHistoryViewerPrinter.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestHistoryViewerPrinter.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestHistoryViewerPrinter.java
index 2e2dbe1..588500c 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestHistoryViewerPrinter.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestHistoryViewerPrinter.java
@@ -17,8 +17,6 @@
  */
 package org.apache.hadoop.mapreduce.jobhistory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.mapred.TaskAttemptID;
 import org.apache.hadoop.mapred.TaskID;
 import org.apache.hadoop.mapred.TaskStatus;
@@ -30,6 +28,8 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -38,8 +38,8 @@ import java.util.TimeZone;
 
 public class TestHistoryViewerPrinter {
 
-  private static final Log LOG = LogFactory.getLog(
-  TestHistoryViewerPrinter.class);
+  private static final Logger LOG =
+  LoggerFactory.getLogger(TestHistoryViewerPrinter.class);
 
   @Test
   public void testHumanPrinter() throws Exception {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/178751ed/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java
index 7e72802..4c847fa 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java
@@ -28,8 +28,6 @@ import javax.annotation.Nullable;
 
 import org.junit.Assert;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.fs.FileStatus;
@@ -48,6 +46,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
@@ -57,7 +57,8 @@ import com.google.common.collect.Sets;
 @RunWith(value = Parameterized.class)
 public class TestFileInputFormat {
   
-  private static final Log LOG = LogFactory.getLog(TestFileInputFormat.class);
+  private static final Logger LOG =
+  LoggerFactory.getLogger(TestFileInputFormat.class);
   
   private static String testTmpDir = System.getProperty("test.build.data", 
"/tmp");
   private static final Path TEST_ROOT_DIR = new Path(testTmpDir, "TestFIF");

http://git-wip-us.apache.org/repos/asf/hadoop/blob/178751ed/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java
index abbfcb2..f72aa55 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/te

[2/3] hadoop git commit: MAPREDUCE-6983. Moving logging APIs over to slf4j in hadoop-mapreduce-client-core. Contributed by Jinjiang Ling.

2017-11-02 Thread aajisaka
http://git-wip-us.apache.org/repos/asf/hadoop/blob/178751ed/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
index b1cb6dc..46e4f1a 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
@@ -27,8 +27,6 @@ import org.apache.avro.io.Encoder;
 import org.apache.avro.io.EncoderFactory;
 import org.apache.avro.specific.SpecificDatumWriter;
 import org.apache.avro.util.Utf8;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.fs.FSDataOutputStream;
@@ -36,6 +34,8 @@ import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.mapreduce.Counter;
 import org.apache.hadoop.mapreduce.CounterGroup;
 import org.apache.hadoop.mapreduce.Counters;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -55,7 +55,7 @@ public class EventWriter {
   private DatumWriter writer =
 new SpecificDatumWriter(Event.class);
   private Encoder encoder;
-  private static final Log LOG = LogFactory.getLog(EventWriter.class);
+  private static final Logger LOG = LoggerFactory.getLogger(EventWriter.class);
 
   /**
* avro encoding format supported by EventWriter.
@@ -112,7 +112,7 @@ public class EventWriter {
   out.close();
   out = null;
 } finally {
-  IOUtils.cleanup(LOG, out);
+  IOUtils.cleanupWithLogger(LOG, out);
 }
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/178751ed/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryParser.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryParser.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryParser.java
index 28fcc92..6efb4f7 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryParser.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryParser.java
@@ -24,8 +24,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
@@ -45,6 +43,8 @@ import org.apache.hadoop.security.authorize.AccessControlList;
 import org.apache.hadoop.util.StringInterner;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.ContainerId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Default Parser for the JobHistory files. Typical usage is
@@ -56,7 +56,8 @@ import org.apache.hadoop.yarn.api.records.ContainerId;
 @InterfaceStability.Unstable
 public class JobHistoryParser implements HistoryEventHandler {
 
-  private static final Log LOG = LogFactory.getLog(JobHistoryParser.class);
+  private static final Logger LOG =
+  LoggerFactory.getLogger(JobHistoryParser.class);
   
   private final FSDataInputStream in;
   private JobInfo info = null;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/178751ed/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/db/BigDecimalSplitter.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/db/BigDecimalSplitter.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/db/BigDecimalSplitter.java
index 325c375..dd1ebdb 10

[1/3] hadoop git commit: MAPREDUCE-6983. Moving logging APIs over to slf4j in hadoop-mapreduce-client-core. Contributed by Jinjiang Ling.

2017-11-02 Thread aajisaka
Repository: hadoop
Updated Branches:
  refs/heads/branch-3.0 9efe9bd3d -> 12f92e636


http://git-wip-us.apache.org/repos/asf/hadoop/blob/12f92e63/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestHistoryViewerPrinter.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestHistoryViewerPrinter.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestHistoryViewerPrinter.java
index 2e2dbe1..588500c 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestHistoryViewerPrinter.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestHistoryViewerPrinter.java
@@ -17,8 +17,6 @@
  */
 package org.apache.hadoop.mapreduce.jobhistory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.mapred.TaskAttemptID;
 import org.apache.hadoop.mapred.TaskID;
 import org.apache.hadoop.mapred.TaskStatus;
@@ -30,6 +28,8 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -38,8 +38,8 @@ import java.util.TimeZone;
 
 public class TestHistoryViewerPrinter {
 
-  private static final Log LOG = LogFactory.getLog(
-  TestHistoryViewerPrinter.class);
+  private static final Logger LOG =
+  LoggerFactory.getLogger(TestHistoryViewerPrinter.class);
 
   @Test
   public void testHumanPrinter() throws Exception {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/12f92e63/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java
index 7e72802..4c847fa 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java
@@ -28,8 +28,6 @@ import javax.annotation.Nullable;
 
 import org.junit.Assert;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.fs.FileStatus;
@@ -48,6 +46,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
@@ -57,7 +57,8 @@ import com.google.common.collect.Sets;
 @RunWith(value = Parameterized.class)
 public class TestFileInputFormat {
   
-  private static final Log LOG = LogFactory.getLog(TestFileInputFormat.class);
+  private static final Logger LOG =
+  LoggerFactory.getLogger(TestFileInputFormat.class);
   
   private static String testTmpDir = System.getProperty("test.build.data", 
"/tmp");
   private static final Path TEST_ROOT_DIR = new Path(testTmpDir, "TestFIF");

http://git-wip-us.apache.org/repos/asf/hadoop/blob/12f92e63/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java
index abbfcb2..f72aa55 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestFileOutputCommitter.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/s

[3/3] hadoop git commit: MAPREDUCE-6983. Moving logging APIs over to slf4j in hadoop-mapreduce-client-core. Contributed by Jinjiang Ling.

2017-11-02 Thread aajisaka
MAPREDUCE-6983. Moving logging APIs over to slf4j in 
hadoop-mapreduce-client-core. Contributed by Jinjiang Ling.

(cherry picked from commit 178751ed8c9d47038acf8616c226f1f52e884feb)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/12f92e63
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/12f92e63
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/12f92e63

Branch: refs/heads/branch-3.0
Commit: 12f92e636efbc1c324da4ec4751dc21dee935062
Parents: 9efe9bd
Author: Akira Ajisaka 
Authored: Thu Nov 2 17:42:52 2017 +0900
Committer: Akira Ajisaka 
Committed: Thu Nov 2 17:43:55 2017 +0900

--
 .../org/apache/hadoop/mapred/BackupStore.java |  7 ---
 .../org/apache/hadoop/mapred/CleanupQueue.java|  8 
 .../java/org/apache/hadoop/mapred/Counters.java   |  4 ++--
 .../DeprecatedQueueConfigurationParser.java   |  8 
 .../org/apache/hadoop/mapred/FileInputFormat.java |  8 
 .../apache/hadoop/mapred/FileOutputCommitter.java |  6 +++---
 .../main/java/org/apache/hadoop/mapred/IFile.java |  6 +++---
 .../apache/hadoop/mapred/IFileInputStream.java|  7 ---
 .../java/org/apache/hadoop/mapred/IndexCache.java |  6 +++---
 .../org/apache/hadoop/mapred/JobACLsManager.java  |  6 +++---
 .../java/org/apache/hadoop/mapred/JobConf.java|  6 +++---
 .../org/apache/hadoop/mapred/JobEndNotifier.java  |  8 
 .../java/org/apache/hadoop/mapred/JvmContext.java |  8 
 .../apache/hadoop/mapred/LineRecordReader.java|  8 
 .../java/org/apache/hadoop/mapred/MapTask.java|  7 ---
 .../java/org/apache/hadoop/mapred/Merger.java |  6 +++---
 .../main/java/org/apache/hadoop/mapred/Queue.java | 10 +-
 .../hadoop/mapred/QueueConfigurationParser.java   |  8 
 .../org/apache/hadoop/mapred/QueueManager.java|  6 +++---
 .../java/org/apache/hadoop/mapred/ReduceTask.java |  9 +
 .../org/apache/hadoop/mapred/SortedRanges.java|  8 
 .../main/java/org/apache/hadoop/mapred/Task.java  | 18 +-
 .../java/org/apache/hadoop/mapred/TaskLog.java| 11 +--
 .../java/org/apache/hadoop/mapred/TaskStatus.java |  8 
 .../org/apache/hadoop/mapred/jobcontrol/Job.java  |  6 +++---
 .../mapred/lib/FieldSelectionMapReduce.java   |  7 ---
 .../apache/hadoop/mapred/lib/InputSampler.java|  6 +++---
 .../hadoop/mapred/lib/MultithreadedMapRunner.java |  8 
 .../apache/hadoop/mapred/pipes/Application.java   |  7 ---
 .../hadoop/mapred/pipes/BinaryProtocol.java   |  8 
 .../apache/hadoop/mapred/pipes/PipesReducer.java  |  7 ---
 .../org/apache/hadoop/mapred/pipes/Submitter.java |  6 +++---
 .../java/org/apache/hadoop/mapreduce/Cluster.java |  7 ---
 .../org/apache/hadoop/mapreduce/CryptoUtils.java  |  6 +++---
 .../java/org/apache/hadoop/mapreduce/Job.java |  6 +++---
 .../hadoop/mapreduce/JobResourceUploader.java |  7 ---
 .../hadoop/mapreduce/JobSubmissionFiles.java  |  7 ---
 .../org/apache/hadoop/mapreduce/JobSubmitter.java | 11 +--
 .../mapreduce/counters/AbstractCounters.java  |  7 ---
 .../counters/FileSystemCounterGroup.java  |  7 ---
 .../mapreduce/counters/FrameworkCounterGroup.java |  7 ---
 .../hadoop/mapreduce/jobhistory/EventWriter.java  |  8 
 .../mapreduce/jobhistory/JobHistoryParser.java|  7 ---
 .../mapreduce/lib/db/BigDecimalSplitter.java  |  7 ---
 .../hadoop/mapreduce/lib/db/DBInputFormat.java|  7 ---
 .../hadoop/mapreduce/lib/db/DBOutputFormat.java   |  7 ---
 .../hadoop/mapreduce/lib/db/DBRecordReader.java   |  7 ---
 .../mapreduce/lib/db/DataDrivenDBInputFormat.java |  7 ---
 .../lib/db/DataDrivenDBRecordReader.java  |  7 ---
 .../hadoop/mapreduce/lib/db/DateSplitter.java |  6 +++---
 .../hadoop/mapreduce/lib/db/FloatSplitter.java|  7 ---
 .../mapreduce/lib/db/OracleDBRecordReader.java|  7 ---
 .../lib/db/OracleDataDrivenDBInputFormat.java |  3 ---
 .../hadoop/mapreduce/lib/db/TextSplitter.java |  6 +++---
 .../lib/fieldsel/FieldSelectionMapper.java|  7 ---
 .../lib/fieldsel/FieldSelectionReducer.java   |  7 ---
 .../lib/input/CombineFileInputFormat.java |  7 ---
 .../mapreduce/lib/input/FileInputFormat.java  |  7 ---
 .../lib/input/FixedLengthRecordReader.java|  8 
 .../mapreduce/lib/input/LineRecordReader.java |  7 ---
 .../lib/input/SequenceFileInputFilter.java|  9 +
 .../mapreduce/lib/jobcontrol/ControlledJob.java   |  7 ---
 .../mapreduce/lib/jobcontrol/JobControl.java  |  6 +++---
 .../mapreduce/lib/map/MultithreadedMapper.java|  7 ---
 .../mapreduce/lib/output/FileOutputCommitter.java |  7 ---
 .../lib/output/PartialFileOutputCommitter.java|  8 
 .../mapre

[2/3] hadoop git commit: MAPREDUCE-6983. Moving logging APIs over to slf4j in hadoop-mapreduce-client-core. Contributed by Jinjiang Ling.

2017-11-02 Thread aajisaka
http://git-wip-us.apache.org/repos/asf/hadoop/blob/12f92e63/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
index b1cb6dc..46e4f1a 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
@@ -27,8 +27,6 @@ import org.apache.avro.io.Encoder;
 import org.apache.avro.io.EncoderFactory;
 import org.apache.avro.specific.SpecificDatumWriter;
 import org.apache.avro.util.Utf8;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.fs.FSDataOutputStream;
@@ -36,6 +34,8 @@ import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.mapreduce.Counter;
 import org.apache.hadoop.mapreduce.CounterGroup;
 import org.apache.hadoop.mapreduce.Counters;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -55,7 +55,7 @@ public class EventWriter {
   private DatumWriter writer =
 new SpecificDatumWriter(Event.class);
   private Encoder encoder;
-  private static final Log LOG = LogFactory.getLog(EventWriter.class);
+  private static final Logger LOG = LoggerFactory.getLogger(EventWriter.class);
 
   /**
* avro encoding format supported by EventWriter.
@@ -112,7 +112,7 @@ public class EventWriter {
   out.close();
   out = null;
 } finally {
-  IOUtils.cleanup(LOG, out);
+  IOUtils.cleanupWithLogger(LOG, out);
 }
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/12f92e63/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryParser.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryParser.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryParser.java
index 28fcc92..6efb4f7 100644
--- 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryParser.java
+++ 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/JobHistoryParser.java
@@ -24,8 +24,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
@@ -45,6 +43,8 @@ import org.apache.hadoop.security.authorize.AccessControlList;
 import org.apache.hadoop.util.StringInterner;
 import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
 import org.apache.hadoop.yarn.api.records.ContainerId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Default Parser for the JobHistory files. Typical usage is
@@ -56,7 +56,8 @@ import org.apache.hadoop.yarn.api.records.ContainerId;
 @InterfaceStability.Unstable
 public class JobHistoryParser implements HistoryEventHandler {
 
-  private static final Log LOG = LogFactory.getLog(JobHistoryParser.class);
+  private static final Logger LOG =
+  LoggerFactory.getLogger(JobHistoryParser.class);
   
   private final FSDataInputStream in;
   private JobInfo info = null;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/12f92e63/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/db/BigDecimalSplitter.java
--
diff --git 
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/db/BigDecimalSplitter.java
 
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/db/BigDecimalSplitter.java
index 325c375..dd1ebdb 10

hadoop git commit: addendum patch for YARN-7289.

2017-11-02 Thread rohithsharmaks
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.9 355539717 -> 6005f0a3e


addendum patch for YARN-7289.

(cherry picked from commit 940ffe3f9ce74286a8863e3743faf88a33c817a3)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6005f0a3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6005f0a3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6005f0a3

Branch: refs/heads/branch-2.9
Commit: 6005f0a3eeba2ff01fd9a29a640377e427a73fbb
Parents: 3555397
Author: Rohith Sharma K S 
Authored: Thu Nov 2 13:55:19 2017 +0530
Committer: Rohith Sharma K S 
Committed: Thu Nov 2 14:11:33 2017 +0530

--
 .../scheduler/AbstractYarnScheduler.java|  4 ++--
 .../scheduler/capacity/CapacityScheduler.java   |  2 +-
 .../rmapp/TestApplicationLifetimeMonitor.java   | 24 +++-
 3 files changed, 16 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6005f0a3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
index 5b6fdc6..3e41da7 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java
@@ -1327,8 +1327,8 @@ public abstract class AbstractYarnScheduler
 
   @Override
   public long checkAndGetApplicationLifetime(String queueName, long lifetime) {
-// -1 indicates, lifetime is not configured.
-return -1;
+// Lifetime is the application lifetime by default.
+return lifetime;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6005f0a3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
index 6e7b8a8..d472d35 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
@@ -2592,7 +2592,7 @@ public class CapacityScheduler extends
   long maximumApplicationLifetime =
   ((LeafQueue) queue).getMaximumApplicationLifetime();
 
-  // check only for maximum, that's enough because default cann't
+  // check only for maximum, that's enough because default can't
   // exceed maximum
   if (maximumApplicationLifetime <= 0) {
 return lifetimeRequestedByApp;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6005f0a3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.java
index b1da9af..037ed99 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestApplicationLifetimeMonitor.jav

[hadoop] Git Push Summary

2017-11-02 Thread sammichen
Repository: hadoop
Updated Branches:
  refs/heads/apache-3.0 [deleted] 4b01ae9c6

-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org



[hadoop] Git Push Summary

2017-11-02 Thread sammichen
Repository: hadoop
Updated Branches:
  refs/heads/apache-trunk [deleted] 0b9eb4c86

-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org



hadoop git commit: HADOOP-14997. Add hadoop-aliyun as dependency of hadoop-cloud-storage. Contributed by Genmao Yu

2017-11-02 Thread sammichen
Repository: hadoop
Updated Branches:
  refs/heads/branch-3.0 12f92e636 -> 6b31a94b0


HADOOP-14997. Add hadoop-aliyun as dependency of hadoop-cloud-storage. 
Contributed by Genmao Yu


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6b31a94b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6b31a94b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6b31a94b

Branch: refs/heads/branch-3.0
Commit: 6b31a94b01db4e3161070c95ba499591de570045
Parents: 12f92e6
Author: Sammi Chen 
Authored: Thu Nov 2 14:33:22 2017 +0800
Committer: Sammi Chen 
Committed: Thu Nov 2 17:08:53 2017 +0800

--
 hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6b31a94b/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
--
diff --git a/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml 
b/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
index 4d69e94..46dadcf 100644
--- a/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
+++ b/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
@@ -105,6 +105,11 @@
 
 
   org.apache.hadoop
+  hadoop-aliyun
+  compile
+
+
+  org.apache.hadoop
   hadoop-aws
   compile
 


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org



hadoop git commit: HADOOP-14997. Add hadoop-aliyun as dependency of hadoop-cloud-storage. Contributed by Genmao Yu

2017-11-02 Thread sammichen
Repository: hadoop
Updated Branches:
  refs/heads/trunk 178751ed8 -> cde56b9ce


HADOOP-14997. Add hadoop-aliyun as dependency of hadoop-cloud-storage. 
Contributed by Genmao Yu


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cde56b9c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cde56b9c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cde56b9c

Branch: refs/heads/trunk
Commit: cde56b9cefe1eb2943eef56a6aa7fdfa1b78e909
Parents: 178751e
Author: Sammi Chen 
Authored: Thu Nov 2 14:26:16 2017 +0800
Committer: Sammi Chen 
Committed: Thu Nov 2 17:12:04 2017 +0800

--
 hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/cde56b9c/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
--
diff --git a/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml 
b/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
index 9711e52..73a9d41 100644
--- a/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
+++ b/hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml
@@ -105,6 +105,11 @@
 
 
   org.apache.hadoop
+  hadoop-aliyun
+  compile
+
+
+  org.apache.hadoop
   hadoop-aws
   compile
 


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org



hadoop git commit: MAPREDUCE-6999. Fix typo onf in DynamicInputChunk.java. Contributed by fang zhenyi.

2017-11-02 Thread aajisaka
Repository: hadoop
Updated Branches:
  refs/heads/trunk cde56b9ce -> cc3f3eca4


MAPREDUCE-6999. Fix typo onf in DynamicInputChunk.java. Contributed by fang 
zhenyi.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cc3f3eca
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cc3f3eca
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cc3f3eca

Branch: refs/heads/trunk
Commit: cc3f3eca409f5e57e540849a80e6448bb4924cc6
Parents: cde56b9
Author: Akira Ajisaka 
Authored: Thu Nov 2 18:32:24 2017 +0900
Committer: Akira Ajisaka 
Committed: Thu Nov 2 18:32:24 2017 +0900

--
 .../java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/cc3f3eca/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
--
diff --git 
a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
 
b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
index 9bf8e47..2335854 100644
--- 
a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
+++ 
b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
@@ -68,7 +68,7 @@ class DynamicInputChunk {
* Method to write records into a chunk.
* @param key Key from the listing file.
* @param value Corresponding value from the listing file.
-   * @throws IOException Exception onf failure to write to the file.
+   * @throws IOException Exception on failure to write to the file.
*/
   public void write(Text key, CopyListingFileStatus value) throws IOException {
 writer.append(key, value);


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org



hadoop git commit: MAPREDUCE-6999. Fix typo onf in DynamicInputChunk.java. Contributed by fang zhenyi.

2017-11-02 Thread aajisaka
Repository: hadoop
Updated Branches:
  refs/heads/branch-3.0 6b31a94b0 -> 2ba71afcd


MAPREDUCE-6999. Fix typo onf in DynamicInputChunk.java. Contributed by fang 
zhenyi.

(cherry picked from commit cc3f3eca409f5e57e540849a80e6448bb4924cc6)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2ba71afc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2ba71afc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2ba71afc

Branch: refs/heads/branch-3.0
Commit: 2ba71afcd5c5feb707af3a83ba137da856c62847
Parents: 6b31a94
Author: Akira Ajisaka 
Authored: Thu Nov 2 18:32:24 2017 +0900
Committer: Akira Ajisaka 
Committed: Thu Nov 2 18:32:57 2017 +0900

--
 .../java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2ba71afc/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
--
diff --git 
a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
 
b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
index 9bf8e47..2335854 100644
--- 
a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
+++ 
b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
@@ -68,7 +68,7 @@ class DynamicInputChunk {
* Method to write records into a chunk.
* @param key Key from the listing file.
* @param value Corresponding value from the listing file.
-   * @throws IOException Exception onf failure to write to the file.
+   * @throws IOException Exception on failure to write to the file.
*/
   public void write(Text key, CopyListingFileStatus value) throws IOException {
 writer.append(key, value);


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org



hadoop git commit: MAPREDUCE-6999. Fix typo onf in DynamicInputChunk.java. Contributed by fang zhenyi.

2017-11-02 Thread aajisaka
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 e53fcd52e -> 82fc80a98


MAPREDUCE-6999. Fix typo onf in DynamicInputChunk.java. Contributed by fang 
zhenyi.

(cherry picked from commit cc3f3eca409f5e57e540849a80e6448bb4924cc6)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/82fc80a9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/82fc80a9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/82fc80a9

Branch: refs/heads/branch-2
Commit: 82fc80a9875fbb440834165d29bb4f19b7f4227e
Parents: e53fcd5
Author: Akira Ajisaka 
Authored: Thu Nov 2 18:32:24 2017 +0900
Committer: Akira Ajisaka 
Committed: Thu Nov 2 18:33:25 2017 +0900

--
 .../java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/82fc80a9/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
--
diff --git 
a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
 
b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
index 9bf8e47..2335854 100644
--- 
a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
+++ 
b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
@@ -68,7 +68,7 @@ class DynamicInputChunk {
* Method to write records into a chunk.
* @param key Key from the listing file.
* @param value Corresponding value from the listing file.
-   * @throws IOException Exception onf failure to write to the file.
+   * @throws IOException Exception on failure to write to the file.
*/
   public void write(Text key, CopyListingFileStatus value) throws IOException {
 writer.append(key, value);


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org



hadoop git commit: MAPREDUCE-6999. Fix typo onf in DynamicInputChunk.java. Contributed by fang zhenyi.

2017-11-02 Thread aajisaka
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.9 6005f0a3e -> 05b7b3d12


MAPREDUCE-6999. Fix typo onf in DynamicInputChunk.java. Contributed by fang 
zhenyi.

(cherry picked from commit cc3f3eca409f5e57e540849a80e6448bb4924cc6)
(cherry picked from commit 82fc80a9875fbb440834165d29bb4f19b7f4227e)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/05b7b3d1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/05b7b3d1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/05b7b3d1

Branch: refs/heads/branch-2.9
Commit: 05b7b3d1268f3c59959ccc139b30108363139e5e
Parents: 6005f0a
Author: Akira Ajisaka 
Authored: Thu Nov 2 18:32:24 2017 +0900
Committer: Akira Ajisaka 
Committed: Thu Nov 2 18:34:46 2017 +0900

--
 .../java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/05b7b3d1/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
--
diff --git 
a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
 
b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
index 9bf8e47..2335854 100644
--- 
a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
+++ 
b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/lib/DynamicInputChunk.java
@@ -68,7 +68,7 @@ class DynamicInputChunk {
* Method to write records into a chunk.
* @param key Key from the listing file.
* @param value Corresponding value from the listing file.
-   * @throws IOException Exception onf failure to write to the file.
+   * @throws IOException Exception on failure to write to the file.
*/
   public void write(Text key, CopyListingFileStatus value) throws IOException {
 writer.append(key, value);


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org



[2/2] hadoop git commit: Add missing 2.8.2 jdiff for YARN API

2017-11-02 Thread asuresh
Add missing 2.8.2 jdiff for YARN API


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/da6ea5c1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/da6ea5c1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/da6ea5c1

Branch: refs/heads/branch-2.9
Commit: da6ea5c1441477a64e89bf4df44f641e778963a6
Parents: 05b7b3d
Author: Arun Suresh 
Authored: Thu Nov 2 07:09:54 2017 -0700
Committer: Arun Suresh 
Committed: Thu Nov 2 07:09:54 2017 -0700

--
 .../jdiff/Apache_Hadoop_YARN_API_2.8.2.xml  | 16988 +
 1 file changed, 16988 insertions(+)
--



-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org