svn commit: r1297763 - in /incubator/accumulo/trunk: ./ src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java

[kturner]

Author: kturner
Date: Tue Mar  6 22:28:11 2012
New Revision: 1297763

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

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

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  6 22:28:11 2012
@@ -1,3 +1,3 @@
 
/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
 /incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1297657
+/incubator/accumulo/branches/1.4:1201902-1297762

Modified: 
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
URL: 
http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java?rev=1297763&r1=1297762&r2=1297763&view=diff
==============================================================================
--- 
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
 (original)
+++ 
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
 Tue Mar  6 22:28:11 2012
@@ -2422,7 +2422,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);
           }