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 62C88200B32 for ; Thu, 9 Jun 2016 04:26:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6156E160A5D; Thu, 9 Jun 2016 02:26:15 +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 B3E97160A2E for ; Thu, 9 Jun 2016 04:26:14 +0200 (CEST) Received: (qmail 20605 invoked by uid 500); 9 Jun 2016 02:26:13 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 20569 invoked by uid 99); 9 Jun 2016 02:26:13 -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; Thu, 09 Jun 2016 02:26:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B1A41E0571; Thu, 9 Jun 2016 02:26:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dhutchis@apache.org To: commits@accumulo.apache.org Date: Thu, 09 Jun 2016 02:26:14 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/5] accumulo git commit: ACCUMULO-4334 Correct JMX Ingest archived-at: Thu, 09 Jun 2016 02:26:15 -0000 ACCUMULO-4334 Correct JMX Ingest Currently retaining long return type, because I am unsure how it might affect binary compatibility. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/63e834ee Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/63e834ee Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/63e834ee Branch: refs/heads/master Commit: 63e834ee373f5ca23c32b8296ed85eeed2e17835 Parents: 6cf5feb Author: Dylan Hutchison Authored: Wed Jun 8 17:17:19 2016 -0700 Committer: Dylan Hutchison Committed: Wed Jun 8 18:52:26 2016 -0700 ---------------------------------------------------------------------- .../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/63e834ee/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 38bd8ac..43ed136 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 @@ -3832,11 +3832,11 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu @Override public long getIngest() { if (this.isEnabled()) { - long result = 0; + double result = 0; for (Tablet tablet : Collections.unmodifiableCollection(onlineTablets.values())) { - result += tablet.getNumEntriesInMemory(); + result += tablet.ingestRate(); } - return result; + return (long) result; } return 0; }