Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT [created] c335fca72 refs/heads/1.6.1-SNAPSHOT 5878a7766 -> 287e4a673 refs/heads/master 73714365b -> 449f7e02b
ACCUMULO-3153 ACCUMULO-3152 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/693daa77 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/693daa77 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/693daa77 Branch: refs/heads/1.6.1-SNAPSHOT Commit: 693daa77399b634f40d62903cdbb27f9e84ceb36 Parents: 5878a77 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Fri Sep 19 13:57:11 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Fri Sep 19 13:57:11 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/tserver/TabletServer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/693daa77/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index 807bb8e..03dc86d 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -337,17 +337,17 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu log.debug(sb.toString()); } + final long keepAliveTimeout = conf.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT); if (lastMemoryCheckTime > 0 && lastMemoryCheckTime < now) { long diff = now - lastMemoryCheckTime; - if (diff > 2 * TIME_BETWEEN_GC_CHECKS) { - log.warn(String.format("Check for long GC pauses not called in a timely fashion. Expected every %.1f seconds but was %.1f seconds since last check", + if (diff > keepAliveTimeout) { + log.warn(String.format("GC pause checker not called in a timely fashion. Expected every %.1f seconds but was %.1f seconds since last check", TIME_BETWEEN_GC_CHECKS / 1000., diff / 1000.)); } lastMemoryCheckTime = now; return; } - final long keepAliveTimeout = conf.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT); if (maxIncreaseInCollectionTime > keepAliveTimeout) { Halt.halt("Garbage collection may be interfering with lock keep-alive. Halting.", -1); }
