You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cd...@apache.org on 2014/08/29 01:31:45 UTC
[2/2] git commit: Fix typos in log messages. Contributed by Ray Chiang
Fix typos in log messages. Contributed by Ray Chiang
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4f950176
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4f950176
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4f950176
Branch: refs/heads/branch-2
Commit: 4f950176026eccd1018913fc42be2110d0eae420
Parents: 1a65717
Author: Chris Douglas <cd...@apache.org>
Authored: Thu Aug 28 16:29:35 2014 -0700
Committer: Chris Douglas <cd...@apache.org>
Committed: Thu Aug 28 16:30:13 2014 -0700
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 8 +++++---
.../mapreduce/v2/app/commit/CommitterEventHandler.java | 2 +-
.../apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java | 2 +-
.../hadoop/mapreduce/v2/app/speculate/DefaultSpeculator.java | 8 ++++----
.../src/main/java/org/apache/hadoop/mapred/BackupStore.java | 2 +-
.../src/test/java/org/apache/hadoop/fs/JHLogAnalyzer.java | 4 ++--
6 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4f950176/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 387d2cc..6c004b5 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -103,16 +103,18 @@ Release 2.6.0 - UNRELEASED
(Chen He via jlowe)
BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
-
+
MAPREDUCE-5890. Support for encrypting Intermediate
data and spills in local filesystem. (asuresh via tucu)
-
+
MAPREDUCE-6007. Add support to distcp to preserve raw.* namespace
extended attributes. (clamb)
-
+
MAPREDUCE-6041. Fix TestOptionsParser. (clamb)
--
+ MAPREDUCE-6051. Fix typos in log messages. (Ray Chiang via cdouglas)
+
Release 2.5.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4f950176/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/commit/CommitterEventHandler.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/commit/CommitterEventHandler.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/commit/CommitterEventHandler.java
index 8c3be86..d56c1e5 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/commit/CommitterEventHandler.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/commit/CommitterEventHandler.java
@@ -202,7 +202,7 @@ public class CommitterEventHandler extends AbstractService
private synchronized void cancelJobCommit() {
Thread threadCommitting = jobCommitThread;
if (threadCommitting != null && threadCommitting.isAlive()) {
- LOG.info("Canceling commit");
+ LOG.info("Cancelling commit");
threadCommitting.interrupt();
// wait up to configured timeout for commit thread to finish
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4f950176/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java
index 4b32c04..6e9f313 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMCommunicator.java
@@ -335,7 +335,7 @@ public abstract class RMCommunicator extends AbstractService
public void setSignalled(boolean isSignalled) {
this.isSignalled = isSignalled;
- LOG.info("RMCommunicator notified that iSignalled is: "
+ LOG.info("RMCommunicator notified that isSignalled is: "
+ isSignalled);
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4f950176/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/speculate/DefaultSpeculator.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/speculate/DefaultSpeculator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/speculate/DefaultSpeculator.java
index 34dcb12..392a51a 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/speculate/DefaultSpeculator.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/speculate/DefaultSpeculator.java
@@ -134,16 +134,16 @@ public class DefaultSpeculator extends AbstractService implements
estimator.contextualize(conf, context);
} catch (InstantiationException ex) {
- LOG.error("Can't make a speculation runtime extimator", ex);
+ LOG.error("Can't make a speculation runtime estimator", ex);
throw new YarnRuntimeException(ex);
} catch (IllegalAccessException ex) {
- LOG.error("Can't make a speculation runtime extimator", ex);
+ LOG.error("Can't make a speculation runtime estimator", ex);
throw new YarnRuntimeException(ex);
} catch (InvocationTargetException ex) {
- LOG.error("Can't make a speculation runtime extimator", ex);
+ LOG.error("Can't make a speculation runtime estimator", ex);
throw new YarnRuntimeException(ex);
} catch (NoSuchMethodException ex) {
- LOG.error("Can't make a speculation runtime extimator", ex);
+ LOG.error("Can't make a speculation runtime estimator", ex);
throw new YarnRuntimeException(ex);
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4f950176/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/BackupStore.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/BackupStore.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/BackupStore.java
index be7fe18..e79ec66 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/BackupStore.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/BackupStore.java
@@ -607,7 +607,7 @@ public class BackupStore<K,V> {
int reserve(int requestedSize, int minSize) {
if (availableSize < minSize) {
- LOG.debug("No Space available. Available: " + availableSize +
+ LOG.debug("No space available. Available: " + availableSize +
" MinSize: " + minSize);
return 0;
} else {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4f950176/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/JHLogAnalyzer.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/JHLogAnalyzer.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/JHLogAnalyzer.java
index 347dd06..8b3f4c8 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/JHLogAnalyzer.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/JHLogAnalyzer.java
@@ -1076,7 +1076,7 @@ public class JHLogAnalyzer {
long execTime,
Path resFileName
) throws IOException {
- LOG.info("Analizing results ...");
+ LOG.info("Analyzing results ...");
DataOutputStream out = null;
BufferedWriter writer = null;
try {
@@ -1118,7 +1118,7 @@ public class JHLogAnalyzer {
if(writer != null) writer.close();
if(out != null) out.close();
}
- LOG.info("Analizing results ... done.");
+ LOG.info("Analyzing results ... done.");
}
private static void cleanup(Configuration conf) throws IOException {