hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject svn commit: r781874 - in /hadoop/hbase/trunk_on_hadoop-0.18.3: CHANGES.txt src/java/org/apache/hadoop/hbase/client/HConnectionManager.java src/java/org/apache/hadoop/hbase/regionserver/HLog.java
Date Thu, 04 Jun 2009 23:49:40 GMT
Author: apurtell
Date: Thu Jun  4 23:49:39 2009
New Revision: 781874

URL: http://svn.apache.org/viewvc?rev=781874&view=rev
Log:
HBASE-1483, HBASE-1466

Modified:
    hadoop/hbase/trunk_on_hadoop-0.18.3/CHANGES.txt
    hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
    hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/regionserver/HLog.java

Modified: hadoop/hbase/trunk_on_hadoop-0.18.3/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk_on_hadoop-0.18.3/CHANGES.txt?rev=781874&r1=781873&r2=781874&view=diff
==============================================================================
--- hadoop/hbase/trunk_on_hadoop-0.18.3/CHANGES.txt (original)
+++ hadoop/hbase/trunk_on_hadoop-0.18.3/CHANGES.txt Thu Jun  4 23:49:39 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,8 @@
    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)
+   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
@@ -306,8 +309,6 @@
    HBASE-1478  Remove hbase master options from shell (Nitay Joffe via Stack)
    HBASE-1462  hclient still seems to depend on master
    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
 
   OPTIMIZATIONS
    HBASE-1412  Change values for delete column and column family in KeyValue

Modified: hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=781874&r1=781873&r2=781874&view=diff
==============================================================================
--- hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
(original)
+++ hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Thu Jun  4 23:49:39 2009
@@ -461,7 +461,7 @@
         return new UnmodifyableHTableDescriptor(HTableDescriptor.ROOT_TABLEDESC);
       }
       if (Bytes.equals(tableName, HConstants.META_TABLE_NAME)) {
-        return new UnmodifyableHTableDescriptor(HTableDescriptor.META_TABLEDESC);
+        return HTableDescriptor.META_TABLEDESC;
       }
       HTableDescriptorFinder finder = new HTableDescriptorFinder(tableName);
       MetaScanner.metaScan(conf, finder);

Modified: hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/regionserver/HLog.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/regionserver/HLog.java?rev=781874&r1=781873&r2=781874&view=diff
==============================================================================
--- hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/regionserver/HLog.java
(original)
+++ hadoop/hbase/trunk_on_hadoop-0.18.3/src/java/org/apache/hadoop/hbase/regionserver/HLog.java
Thu Jun  4 23:49:39 2009
@@ -795,13 +795,13 @@
           // 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 {
+              HLogKey key = new HLogKey();
+              KeyValue val = new KeyValue();
               while (in.next(key, val)) {
                 byte [] regionName = key.getRegionName();
                 LinkedList<HLogEntry> queue = logEntries.get(regionName);
@@ -812,6 +812,10 @@
                 }
                 queue.push(new HLogEntry(val, key));
                 count++;
+                // Make the key and value new each time; otherwise same instance
+                // is used over and over.
+                key = new HLogKey();
+                val = new KeyValue();
               }
               LOG.debug("Pushed " + count + " entries from " +
                 logfiles[i].getPath());



Mime
View raw message