hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jiten...@apache.org
Subject svn commit: r1377098 - in /hadoop/common/branches/branch-1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
Date Fri, 24 Aug 2012 20:42:45 GMT
Author: jitendra
Date: Fri Aug 24 20:42:44 2012
New Revision: 1377098

URL: http://svn.apache.org/viewvc?rev=1377098&view=rev
Log:
HDFS-3838. Fix the typo in FSEditLog.java: isToterationEnabled should be isTolerationEnabled.
Contributed by Brandon Li.

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1377098&r1=1377097&r2=1377098&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Fri Aug 24 20:42:44 2012
@@ -90,6 +90,9 @@ Release 1.2.0 - unreleased
     HDFS-3819. Should check whether invalidate work percentage default value is 
     not greater than 1.0f. (Jing Zhao via jitendra)
 
+    HDFS-3838. Fix the typo in FSEditLog.java: isToterationEnabled should be 
+    isTolerationEnabled. (Brandon Li via jitendra)
+
   OPTIMIZATIONS
 
     HDFS-2533. Backport: Remove needless synchronization on some FSDataSet

Modified: hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java?rev=1377098&r1=1377097&r2=1377098&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
(original)
+++ hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
Fri Aug 24 20:42:44 2012
@@ -643,7 +643,7 @@ public class FSEditLog {
     long recentOpcodeOffsets[] = new long[4];
     Arrays.fill(recentOpcodeOffsets, -1);
 
-    final boolean isToterationEnabled = tolerationLength >= 0;
+    final boolean isTolerationEnabled = tolerationLength >= 0;
     DataInputStream in = new DataInputStream(tracker);
     Byte opcode = null;
     try {
@@ -670,7 +670,7 @@ public class FSEditLog {
                             "Unsupported version " + logVersion;
 
       while (true) {
-        if (isToterationEnabled) {
+        if (isTolerationEnabled) {
           //mark position could be reset in case of exceptions
           in.mark(TRANSACTION_LENGTH_LIMIT); 
         }
@@ -1007,7 +1007,7 @@ public class FSEditLog {
           + ") at position " + tracker.getPos()
           + ", edit log length is " + edits.length()
           + ", opcode=" + opcode
-          + ", isToterationEnabled=" + isToterationEnabled;
+          + ", isTolerationEnabled=" + isTolerationEnabled;
 
       // Catch Throwable because in the case of a truly corrupt edits log, any
       // sort of error might be thrown (NumberFormat, NullPointer, EOF, etc.)
@@ -1035,7 +1035,7 @@ public class FSEditLog {
       }
 
       LOG.warn(msg, t);
-      if (isToterationEnabled) {
+      if (isTolerationEnabled) {
         in.reset(); //reset to the beginning position of this transaction
       } else {
         //edit log toleration feature is disabled



Mime
View raw message