Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 83E8A200BD3 for ; Mon, 31 Oct 2016 18:25:20 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 80B8B160B08; Mon, 31 Oct 2016 17:25:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 94224160B1B for ; Mon, 31 Oct 2016 18:25:18 +0100 (CET) Received: (qmail 51673 invoked by uid 500); 31 Oct 2016 17:25:17 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 51415 invoked by uid 99); 31 Oct 2016 17:25:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Oct 2016 17:25:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A49CAF0BEA; Mon, 31 Oct 2016 17:25:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: spmallette@apache.org To: commits@tinkerpop.apache.org Date: Mon, 31 Oct 2016 17:25:39 -0000 Message-Id: <900d785138e44354b52610963e444ea9@git.apache.org> In-Reply-To: <6bc56d79bf2e4c5bad2ca7316f9c776c@git.apache.org> References: <6bc56d79bf2e4c5bad2ca7316f9c776c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [23/31] tinkerpop git commit: Fully shutdown metrics services in Gremlin Server on shutdown CTR archived-at: Mon, 31 Oct 2016 17:25:20 -0000 Fully shutdown metrics services in Gremlin Server on shutdown CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/30c2600b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/30c2600b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/30c2600b Branch: refs/heads/TINKERPOP-932 Commit: 30c2600bff074a7053cecab90baeccb60b087456 Parents: bfda550 Author: Stephen Mallette Authored: Fri Oct 28 12:00:59 2016 -0400 Committer: Stephen Mallette Committed: Fri Oct 28 12:00:59 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../java/org/apache/tinkerpop/gremlin/server/GremlinServer.java | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/30c2600b/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 52ae70d..9685f20 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.1.6 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* Fully shutdown metrics services in Gremlin Server on shutdown. * Deprecated `tryRandomCommit()` in `AbstractGremlinTest` - the annotation was never added in 3.1.1, and was only deprecated via javadoc. * Minor fixes to various test feature requirements in `gremlin-test`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/30c2600b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java ---------------------------------------------------------------------- diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java index 4d76e30..e4a7162 100644 --- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java +++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java @@ -313,6 +313,11 @@ public class GremlinServer { } }); + // kills reporter threads. this is a last bit of cleanup that can be done. typically, the jvm is headed + // for shutdown which would obviously kill the reporters, but when it isn't they just keep reporting. + // removing them all will silent them up and release the appropriate resources. + MetricManager.INSTANCE.removeAllReporters(); + logger.info("Gremlin Server - shutdown complete"); serverStopped.complete(null); }, SERVER_THREAD_PREFIX + "stop").start();