hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r781865 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/regionserver/HLog.java
Date Thu, 04 Jun 2009 22:49:54 GMT
Author: stack
Date: Thu Jun  4 22:49:53 2009
New Revision: 781865

URL: http://svn.apache.org/viewvc?rev=781865&view=rev
Log:
HBASE-1483 HLog split loses track of edits

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=781865&r1=781864&r2=781865&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Thu Jun  4 22:49:53 2009
@@ -162,6 +162,7 @@
                becoming in-operational (Ryan Rawson via Stack)
    HBASE-1471  During cluster shutdown, deleting zookeeper regionserver nodes
                causes exceptions
+   HBASE-1483  HLog split loses track of edits (Clint Morgan via Stack)
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage
@@ -299,6 +300,10 @@
    HBASE-1464  Add hbase.regionserver.logroll.period to hbase-default
    HBASE-1192  LRU-style map for the block cache (Jon Gray and Ryan Rawson
                via Stack)
+<<<<<<< .mine
+   HBASE-1466  Binary keys are not first class citizens
+               (Ryan Rawson via Stack)
+=======
    HBASE-1445  Add the ability to start a master from any machine
    HBASE-1474  Add zk attributes to list of attributes 
                in master and regionserver UIs
@@ -308,6 +313,7 @@
    HBASE-1143  region count erratic in master UI
                (kill server hosting root or meta and see how count goes awry)....
                make sure you have a bunch of reions in there
+>>>>>>> .r781864
 
   OPTIMIZATIONS
    HBASE-1412  Change values for delete column and column family in KeyValue

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java?rev=781865&r1=781864&r2=781865&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java Thu Jun  4
22:49:53 2009
@@ -795,13 +795,15 @@
           // reports a zero length even if the file has been sync'd. Revisit if
           // HADOOP-4751 is committed.
           long length = logfiles[i].getLen();
-          HLogKey key = new HLogKey();
-          KeyValue val = new KeyValue();
           SequenceFile.Reader in = null;
               int count = 0;
           try {
             in = new SequenceFile.Reader(fs, logfiles[i].getPath(), conf);
             try {
+              // Make the key and value new each time; otherwise same instance
+              // is used over and over.
+              HLogKey key = new HLogKey();
+              KeyValue val = new KeyValue();
               while (in.next(key, val)) {
                 byte [] regionName = key.getRegionName();
                 LinkedList<HLogEntry> queue = logEntries.get(regionName);



Mime
View raw message