You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2011/01/05 01:49:25 UTC

svn commit: r1055255 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java

Author: stack
Date: Wed Jan  5 00:49:25 2011
New Revision: 1055255

URL: http://svn.apache.org/viewvc?rev=1055255&view=rev
Log:
HBASE-3409 Failed server shutdown processing when retrying hlog split

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1055255&r1=1055254&r2=1055255&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Wed Jan  5 00:49:25 2011
@@ -775,6 +775,7 @@ Release 0.90.0 - Unreleased
    HBASE-3392  Update backport of InputSampler to reflect MAPREDUCE-1820
    HBASE-3408  AssignmentManager NullPointerException
    HBASE-3402  Web UI shows two META regions
+   HBASE-3409  Failed server shutdown processing when retrying hlog split
 
 
   IMPROVEMENTS

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java?rev=1055255&r1=1055254&r2=1055255&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java Wed Jan  5 00:49:25 2011
@@ -196,6 +196,9 @@ public class MasterFileSystem {
         splitter.splitLog();
       } catch (OrphanHLogAfterSplitException e) {
         LOG.warn("Retrying splitting because of:", e);
+        // An HLogSplitter instance can only be used once.  Get new instance.
+        splitter = HLogSplitter.createLogSplitter(conf, rootdir, logDir,
+          oldLogDir, this.fs);
         splitter.splitLog();
       }
       splitTime = splitter.getTime();