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 2014/09/19 20:02:10 UTC
[1/7] git commit: ACCUMULO-3153 ACCUMULO-3152
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 <er...@gmail.com>
Authored: Fri Sep 19 13:57:11 2014 -0400
Committer: Eric C. Newton <er...@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);
}
[2/7] git commit: ACCUMULO-3153 ACCUMULO-3152
Posted by ec...@apache.org.
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/master
Commit: 693daa77399b634f40d62903cdbb27f9e84ceb36
Parents: 5878a77
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Sep 19 13:57:11 2014 -0400
Committer: Eric C. Newton <er...@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);
}
[7/7] git commit: ACCUMULO-3153 ACCUMULO-3152
Posted by ec...@apache.org.
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/449f7e02
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/449f7e02
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/449f7e02
Branch: refs/heads/master
Commit: 449f7e02ba39e8bbe2eb25988d59cd7c9314c90a
Parents: dcc2c53
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Sep 19 14:02:03 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Sep 19 14:02:03 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/GarbageCollectionLogger.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/449f7e02/server/tserver/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java b/server/tserver/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
index cd7dfc8..8bb163d 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/server/GarbageCollectionLogger.java
@@ -98,7 +98,7 @@ public class GarbageCollectionLogger {
if (lastMemoryCheckTime > 0 && lastMemoryCheckTime < now) {
final long diff = now - lastMemoryCheckTime;
if (diff > keepAliveTimeout) {
- 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",
+ log.warn(String.format("GC pause checker not called in a timely fashion. Expected every %.1f seconds but was %.1f seconds since last check",
keepAliveTimeout / 1000., diff / 1000.));
}
lastMemoryCheckTime = now;
[4/7] git commit: ACCUMULO-3152 fix typo
Posted by ec...@apache.org.
ACCUMULO-3152 fix typo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/287e4a67
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/287e4a67
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/287e4a67
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 287e4a67349c190ee5c52d91ee340ca53778e5c9
Parents: 693daa7
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Sep 19 13:57:59 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Sep 19 13:57:59 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/monitor/servlets/ScanServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/287e4a67/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
index a4f99c4..f1ada79 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
@@ -46,7 +46,7 @@ public class ScanServlet extends BasicServlet {
Table scanTable = new Table("scanStatus", "Scan Status");
scanTable.addSortableColumn("Server", new TServerLinkType(), null);
scanTable.addSortableColumn("#", new PreciseNumberType(0, 20, 0, 100), "Number of scans presently running");
- scanTable.addSortableColumn("Oldest Age", new DurationType(0l, 5 * 60 * 100l), "The age of the oldest scan on this server.");
+ scanTable.addSortableColumn("Oldest Age", new DurationType(0l, 5 * 60 * 1000l), "The age of the oldest scan on this server.");
for (TabletServerStatus tserverInfo : Monitor.getMmi().getTServerInfo()) {
ScanStats stats = scans.get(tserverInfo.name);
long count = 0;
[6/7] git commit: ACCUMULO-3152 fix typo
Posted by ec...@apache.org.
ACCUMULO-3152 fix typo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dcc2c534
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dcc2c534
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dcc2c534
Branch: refs/heads/master
Commit: dcc2c5349b944a6dec7ac1d57175c4d9745c68f4
Parents: 526d421
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Sep 19 14:01:50 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Sep 19 14:01:50 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/monitor/servlets/ScanServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/dcc2c534/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
index a4f99c4..f1ada79 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
@@ -46,7 +46,7 @@ public class ScanServlet extends BasicServlet {
Table scanTable = new Table("scanStatus", "Scan Status");
scanTable.addSortableColumn("Server", new TServerLinkType(), null);
scanTable.addSortableColumn("#", new PreciseNumberType(0, 20, 0, 100), "Number of scans presently running");
- scanTable.addSortableColumn("Oldest Age", new DurationType(0l, 5 * 60 * 100l), "The age of the oldest scan on this server.");
+ scanTable.addSortableColumn("Oldest Age", new DurationType(0l, 5 * 60 * 1000l), "The age of the oldest scan on this server.");
for (TabletServerStatus tserverInfo : Monitor.getMmi().getTServerInfo()) {
ScanStats stats = scans.get(tserverInfo.name);
long count = 0;
[3/7] git commit: ACCUMULO-3152 fix typo
Posted by ec...@apache.org.
ACCUMULO-3152 fix typo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/287e4a67
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/287e4a67
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/287e4a67
Branch: refs/heads/master
Commit: 287e4a67349c190ee5c52d91ee340ca53778e5c9
Parents: 693daa7
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Sep 19 13:57:59 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Sep 19 13:57:59 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/monitor/servlets/ScanServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/287e4a67/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
index a4f99c4..f1ada79 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
@@ -46,7 +46,7 @@ public class ScanServlet extends BasicServlet {
Table scanTable = new Table("scanStatus", "Scan Status");
scanTable.addSortableColumn("Server", new TServerLinkType(), null);
scanTable.addSortableColumn("#", new PreciseNumberType(0, 20, 0, 100), "Number of scans presently running");
- scanTable.addSortableColumn("Oldest Age", new DurationType(0l, 5 * 60 * 100l), "The age of the oldest scan on this server.");
+ scanTable.addSortableColumn("Oldest Age", new DurationType(0l, 5 * 60 * 1000l), "The age of the oldest scan on this server.");
for (TabletServerStatus tserverInfo : Monitor.getMmi().getTServerInfo()) {
ScanStats stats = scans.get(tserverInfo.name);
long count = 0;
[5/7] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by ec...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/526d4211
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/526d4211
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/526d4211
Branch: refs/heads/master
Commit: 526d4211d8ef2d8e332f16f2784fa8bddfd1d509
Parents: 7371436 287e4a6
Author: Eric C. Newton <er...@gmail.com>
Authored: Fri Sep 19 14:00:20 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Fri Sep 19 14:00:20 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------