You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2012/03/19 15:25:24 UTC
svn commit: r1302471 - in /incubator/accumulo/trunk: ./
server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
Author: ecn
Date: Mon Mar 19 14:25:23 2012
New Revision: 1302471
URL: http://svn.apache.org/viewvc?rev=1302471&view=rev
Log:
ACCUMULO-468: merge to trunk
Modified:
incubator/accumulo/trunk/ (props changed)
incubator/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
Merged /incubator/accumulo/branches/1.4:r1302468
Modified: incubator/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java?rev=1302471&r1=1302470&r2=1302471&view=diff
==============================================================================
--- incubator/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java (original)
+++ incubator/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java Mon Mar 19 14:25:23 2012
@@ -273,7 +273,7 @@ public class TabletServer extends Abstra
gcTimeIncreasedCount = 0;
} else {
gcTimeIncreasedCount++;
- if (gcTimeIncreasedCount > 3 && mem < rt.totalMemory() * 0.05) {
+ if (gcTimeIncreasedCount > 3 && mem < rt.maxMemory() * 0.05) {
log.warn("Running low on memory");
gcTimeIncreasedCount = 0;
}