incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject svn commit: r1297764 - in /incubator/accumulo/branches/1.3: ./ src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
Date Tue, 06 Mar 2012 22:31:40 GMT
Author: kturner
Date: Tue Mar  6 22:31:40 2012
New Revision: 1297764

URL: http://svn.apache.org/viewvc?rev=1297764&view=rev
Log:
ACCUMULO-444 check num entries in mem after log recovery, not num tablet entries (merged from
1.4)

Modified:
    incubator/accumulo/branches/1.3/   (props changed)
    incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java

Propchange: incubator/accumulo/branches/1.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  6 22:31:40 2012
@@ -1,3 +1,3 @@
 /incubator/accumulo/branches/1.3:1209653
 /incubator/accumulo/branches/1.3.5rc:1209653,1209938
-/incubator/accumulo/branches/1.4:1209531,1297304-1297306
+/incubator/accumulo/branches/1.4:1209531,1297304-1297306,1297762

Modified: incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java?rev=1297764&r1=1297763&r2=1297764&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
(original)
+++ incubator/accumulo/branches/1.3/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
Tue Mar  6 22:31:40 2012
@@ -2182,7 +2182,7 @@ public class TabletServer extends Abstra
              */
 
             tablet.waitForMinC();
-          } else if (tablet.getNumEntries() > 0) {
+          } else if (tablet.getNumEntriesInMemory() > 0) {
             log.warn("Minor compaction after recovery fails for " + extentToOpen);
           }
           



Mime
View raw message