Repository: accumulo Updated Branches: refs/heads/master aaaca5240 -> a80138315
ACCUMULO-3999 use a reasonable timeout for the threadpool shutdown Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a8013831 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a8013831 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a8013831 Branch: refs/heads/master Commit: a801383150cfc40fd684c36fc24c97aa40b1dab9 Parents: aaaca52 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Mon Oct 19 10:42:18 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Mon Oct 19 10:42:18 2015 -0400 ---------------------------------------------------------------------- server/master/src/main/java/org/apache/accumulo/master/Master.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8013831/server/master/src/main/java/org/apache/accumulo/master/Master.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java index 152831d..fbfcf5b 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@ -1096,7 +1096,7 @@ public class Master extends AccumuloServerContext implements LiveTServerSet.List } tp.shutdown(); try { - tp.awaitTermination(5, TimeUnit.MINUTES); + tp.awaitTermination(getConfiguration().getTimeInMillis(Property.TSERV_CLIENT_TIMEOUT) * 2, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { log.debug("Interrupted while fetching status"); }
