svn commit: r1230655 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java

[ramkrishna]

Author: ramkrishna
Date: Thu Jan 12 17:35:12 2012
New Revision: 1230655

URL: http://svn.apache.org/viewvc?rev=1230655&view=rev
Log:
HBASE-5158 Backport HBASE-4878 - Master crash when splitting hlog may cause 
data loss (Ram)

Modified:
    hbase/branches/0.90/CHANGES.txt
    
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1230655&r1=1230654&r2=1230655&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Thu Jan 12 17:35:12 2012
@@ -157,6 +157,7 @@ Release 0.90.5 - Dec 22, 2011
                continually killing server and moving region in testing 
environment(Ram)
    HBASE-5157  Backport HBASE-4880- Region is on service before 
openRegionHandler 
                completes, may cause data loss (Ram)
+   HBASE-5158  Backport HBASE-4878 - Master crash when splitting hlog may 
cause data loss (Ram)
 
   NEW FEATURE
    HBASE-4377  [hbck] Offline rebuild .META. from fs data only

Modified: 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java?rev=1230655&r1=1230654&r2=1230655&view=diff
==============================================================================
--- 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
 (original)
+++ 
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
 Thu Jan 12 17:35:12 2012
@@ -295,10 +295,11 @@ public class HLogSplitter {
             "Discovered orphan hlog after split. Maybe the "
             + "HRegionServer was not dead when we started");
       }
-      archiveLogs(srcDir, corruptedLogs, processedLogs, oldLogDir, fs, conf);  
    
+           
     } finally {
       splits = outputSink.finishWritingAndClose();
     }
+    archiveLogs(srcDir, corruptedLogs, processedLogs, oldLogDir, fs, conf); 
     return splits;
   }