You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dh...@apache.org on 2016/06/09 01:57:15 UTC

[2/2] accumulo git commit: ACCUMULO-4334 Correct JMX Ingest

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/1.6
Commit: 63e834ee373f5ca23c32b8296ed85eeed2e17835
Parents: 6cf5feb
Author: Dylan Hutchison <dh...@cs.washington.edu>
Authored: Wed Jun 8 17:17:19 2016 -0700
Committer: Dylan Hutchison <dh...@cs.washington.edu>
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;
   }