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 D4982200828 for ; Fri, 13 May 2016 18:39:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D3427160A1E; Fri, 13 May 2016 16:39:02 +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 2A32E160A12 for ; Fri, 13 May 2016 18:39:02 +0200 (CEST) Received: (qmail 85832 invoked by uid 500); 13 May 2016 16:39:01 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 85484 invoked by uid 99); 13 May 2016 16:39:01 -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; Fri, 13 May 2016 16:39:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D2523E03EC; Fri, 13 May 2016 16:39:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmckenzie@apache.org To: commits@cassandra.apache.org Date: Fri, 13 May 2016 16:39:02 -0000 Message-Id: <49b5835c45084dd19c6df187f480329f@git.apache.org> In-Reply-To: <86d0edb579bb4d1d88fb9cdc3f948721@git.apache.org> References: <86d0edb579bb4d1d88fb9cdc3f948721@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/15] cassandra git commit: CASSANDRA-11644 - commit to 2.1/2.2/3.0 branches archived-at: Fri, 13 May 2016 16:39:03 -0000 CASSANDRA-11644 - commit to 2.1/2.2/3.0 branches Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fccded58 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fccded58 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fccded58 Branch: refs/heads/trunk Commit: fccded58a6f2ea03dd501c3889e0aa14b6571e16 Parents: 11d4e73 Author: jasonstack Authored: Tue Apr 26 00:07:29 2016 +0800 Committer: Josh McKenzie Committed: Fri May 13 12:36:54 2016 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/GCInspector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fccded58/src/java/org/apache/cassandra/service/GCInspector.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/GCInspector.java b/src/java/org/apache/cassandra/service/GCInspector.java index cf17a34..2d3d4f3 100644 --- a/src/java/org/apache/cassandra/service/GCInspector.java +++ b/src/java/org/apache/cassandra/service/GCInspector.java @@ -48,7 +48,7 @@ public class GCInspector implements NotificationListener, GCInspectorMXBean private static final Logger logger = LoggerFactory.getLogger(GCInspector.class); final static long MIN_LOG_DURATION = 200; final static long GC_WARN_THRESHOLD_IN_MS = DatabaseDescriptor.getGCWarnThreshold(); - final static long STAT_THRESHOLD = Math.min(GC_WARN_THRESHOLD_IN_MS != 0 ? GC_WARN_THRESHOLD_IN_MS : MIN_LOG_DURATION, MIN_LOG_DURATION); + final static long STAT_THRESHOLD = GC_WARN_THRESHOLD_IN_MS != 0 ? GC_WARN_THRESHOLD_IN_MS : MIN_LOG_DURATION; static final class State {