瀏覽代碼

Fix typos in log messages. Contributed by Ray Chiang

Chris Douglas 10 年之前
父節點
當前提交
fef8554be8

+ 5 - 3
hadoop-mapreduce-project/CHANGES.txt

@@ -252,16 +252,18 @@ Release 2.6.0 - UNRELEASED
     (Chen He via jlowe)
     (Chen He via jlowe)
 
 
     BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
     BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
-  
+
       MAPREDUCE-5890. Support for encrypting Intermediate 
       MAPREDUCE-5890. Support for encrypting Intermediate 
       data and spills in local filesystem. (asuresh via tucu)
       data and spills in local filesystem. (asuresh via tucu)
-  
+
       MAPREDUCE-6007. Add support to distcp to preserve raw.* namespace
       MAPREDUCE-6007. Add support to distcp to preserve raw.* namespace
       extended attributes. (clamb)
       extended attributes. (clamb)
-  
+
       MAPREDUCE-6041. Fix TestOptionsParser. (clamb)
       MAPREDUCE-6041. Fix TestOptionsParser. (clamb)
     --
     --
 
 
+    MAPREDUCE-6051. Fix typos in log messages. (Ray Chiang via cdouglas)
+
 Release 2.5.1 - UNRELEASED
 Release 2.5.1 - UNRELEASED
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 1 - 1
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() {
   private synchronized void cancelJobCommit() {
     Thread threadCommitting = jobCommitThread;
     Thread threadCommitting = jobCommitThread;
     if (threadCommitting != null && threadCommitting.isAlive()) {
     if (threadCommitting != null && threadCommitting.isAlive()) {
-      LOG.info("Canceling commit");
+      LOG.info("Cancelling commit");
       threadCommitting.interrupt();
       threadCommitting.interrupt();
 
 
       // wait up to configured timeout for commit thread to finish
       // wait up to configured timeout for commit thread to finish

+ 1 - 1
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) {
   public void setSignalled(boolean isSignalled) {
     this.isSignalled = isSignalled;
     this.isSignalled = isSignalled;
-    LOG.info("RMCommunicator notified that iSignalled is: " 
+    LOG.info("RMCommunicator notified that isSignalled is: " 
         + isSignalled);
         + isSignalled);
   }
   }
 
 

+ 4 - 4
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);
       estimator.contextualize(conf, context);
     } catch (InstantiationException ex) {
     } 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);
       throw new YarnRuntimeException(ex);
     } catch (IllegalAccessException 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);
       throw new YarnRuntimeException(ex);
     } catch (InvocationTargetException 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);
       throw new YarnRuntimeException(ex);
     } catch (NoSuchMethodException 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);
       throw new YarnRuntimeException(ex);
     }
     }
     
     

+ 1 - 1
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) {
     int reserve(int requestedSize, int minSize) {
       if (availableSize < minSize) {
       if (availableSize < minSize) {
-        LOG.debug("No Space available. Available: " + availableSize + 
+        LOG.debug("No space available. Available: " + availableSize + 
             " MinSize: " + minSize);
             " MinSize: " + minSize);
         return 0;
         return 0;
       } else {
       } else {

+ 2 - 2
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,
                                      long execTime,
                                      Path resFileName
                                      Path resFileName
                                      ) throws IOException {
                                      ) throws IOException {
-    LOG.info("Analizing results ...");
+    LOG.info("Analyzing results ...");
     DataOutputStream out = null;
     DataOutputStream out = null;
     BufferedWriter writer = null;
     BufferedWriter writer = null;
     try {
     try {
@@ -1118,7 +1118,7 @@ public class JHLogAnalyzer {
       if(writer != null) writer.close();
       if(writer != null) writer.close();
       if(out != null) out.close();
       if(out != null) out.close();
     }
     }
-    LOG.info("Analizing results ... done.");
+    LOG.info("Analyzing results ... done.");
   }
   }
 
 
   private static void cleanup(Configuration conf) throws IOException {
   private static void cleanup(Configuration conf) throws IOException {