HADOOP-10946. Fix a bunch of typos in log messages (Ray Chiang via aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9f03a7c0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9f03a7c0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9f03a7c0 Branch: refs/heads/HDFS-6581 Commit: 9f03a7c018bb2c497cd0ef758f1a3e08e8163d06 Parents: 444acf8 Author: Allen Wittenauer <a...@apache.org> Authored: Fri Sep 19 11:32:55 2014 -0700 Committer: Allen Wittenauer <a...@apache.org> Committed: Fri Sep 19 11:33:07 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../main/java/org/apache/hadoop/io/VersionMismatchException.java | 2 +- .../org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java | 2 +- .../src/main/java/org/apache/hadoop/util/DiskChecker.java | 2 +- .../java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java | 2 +- .../src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java | 2 +- .../src/main/java/org/apache/hadoop/streaming/StreamJob.java | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f03a7c0/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 90053fc..7fc3b5b 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -838,6 +838,8 @@ Release 2.6.0 - UNRELEASED HADOOP-11109. Site build is broken. (Jian He via atm) + HADOOP-10946. Fix a bunch of typos in log messages (Ray Chiang via aw) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f03a7c0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/VersionMismatchException.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/VersionMismatchException.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/VersionMismatchException.java index a72be58..015c15e 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/VersionMismatchException.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/VersionMismatchException.java @@ -41,7 +41,7 @@ public class VersionMismatchException extends IOException { /** Returns a string representation of this object. */ @Override public String toString(){ - return "A record version mismatch occured. Expecting v" + return "A record version mismatch occurred. Expecting v" + expectedVersion + ", found v" + foundVersion; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f03a7c0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java index 57014d5..9c9164e 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java @@ -160,7 +160,7 @@ public abstract class MetricsDynamicMBeanBase implements DynamicMBean { else if (attributeName.endsWith(MAX_TIME)) return or.getMaxTime(); else { - MetricsUtil.LOG.error("Unexpected attrubute suffix"); + MetricsUtil.LOG.error("Unexpected attribute suffix"); throw new AttributeNotFoundException(); } } else { http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f03a7c0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java index f2ee446..6b27ae5 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/DiskChecker.java @@ -102,7 +102,7 @@ public class DiskChecker { */ public static void checkDir(File dir) throws DiskErrorException { if (!mkdirsWithExistsCheck(dir)) { - throw new DiskErrorException("Can not create directory: " + throw new DiskErrorException("Cannot create directory: " + dir.toString()); } checkDirAccess(dir); http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f03a7c0/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java index 577711f..dae957e 100644 --- a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java +++ b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azure/NativeAzureFileSystem.java @@ -1095,7 +1095,7 @@ public class NativeAzureFileSystem extends FileSystem { if (dstKey.startsWith(srcKey + PATH_DELIMITER)) { if (LOG.isDebugEnabled()) { - LOG.debug("Renaming directory to a itself is disallowed. src=" + src + LOG.debug("Renaming directory to itself is disallowed. src=" + src + " dest=" + dst); } return false; http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f03a7c0/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java index 4620cfc..8ac590b 100644 --- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java +++ b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/Gridmix.java @@ -681,7 +681,7 @@ public class Gridmix extends Configured implements Tool { } catch (IOException e) { LOG.warn("Failure killing " + job.getJobName(), e); } catch (Exception e) { - LOG.error("Unexcpected exception", e); + LOG.error("Unexpected exception", e); } } LOG.info("Done."); http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f03a7c0/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java index c64c0b6..7ff5641 100644 --- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java +++ b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java @@ -1016,7 +1016,7 @@ public class StreamJob implements Tool { if (background_) { LOG.info("Job is running in background."); } else if (!jc_.monitorAndPrintJob(jobConf_, running_)) { - LOG.error("Job not Successful!"); + LOG.error("Job not successful!"); return 1; } LOG.info("Output directory: " + output_);
