svn commit: r1229649 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java

[ra...@apache.org]

Author: ramkrishna
Date: Tue Jan 10 17:33:49 2012
New Revision: 1229649

URL: http://svn.apache.org/viewvc?rev=1229649&view=rev
Log:
HBASE-5137 MasterFileSystem.splitLog() should abort even if waitOnSafeMode() throws IOException(Ram & Ted)

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

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1229649&r1=1229648&r2=1229649&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Jan 10 17:33:49 2012
@@ -475,6 +475,7 @@ Release 0.92.0 - Unreleased
    HBASE-5088  A concurrency issue on SoftValueSortedMap (Jieshan Bean and Lars H)
    HBASE-5152  Region is on service before completing initialization when doing rollback of split,
                it will affect read correctness (Chunhui)
+   HBASE-5137  MasterFileSystem.splitLog() should abort even if waitOnSafeMode() throws IOException(Ted)
 
   TESTS
    HBASE-4450  test for number of blocks read: to serve as baseline for expected

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java?rev=1229649&r1=1229648&r2=1229649&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java Tue Jan 10 17:33:49 2012
@@ -227,9 +227,10 @@ public class MasterFileSystem {
               "hbase.hlog.split.failure.retry.interval", 30 * 1000));
           }
         } catch (InterruptedException e) {
-          LOG.warn("Interrupted, returning w/o splitting at startup");
+          LOG.warn("Interrupted, aborting since cannot return w/o splitting");
           Thread.currentThread().interrupt();
           retrySplitting = false;
+          Runtime.getRuntime().halt(1);
         }
       }
     } while (retrySplitting);