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 E8162200D6C for ; Tue, 19 Dec 2017 22:14:13 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E6D5F160BFF; Tue, 19 Dec 2017 21:14:13 +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 40F31160C1B for ; Tue, 19 Dec 2017 22:14:13 +0100 (CET) Received: (qmail 80668 invoked by uid 500); 19 Dec 2017 21:14:11 -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 80594 invoked by uid 99); 19 Dec 2017 21:14:11 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Dec 2017 21:14:11 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 6598081B2F; Tue, 19 Dec 2017 21:14:10 +0000 (UTC) Date: Tue, 19 Dec 2017 21:14:10 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] branch master updated: ACCUMULO-4766 Fix Monitor table stats MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <151371805034.9902.6134133592294621692@gitbox.apache.org> From: mmiller@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: dd5d5e91bac2576435ac05a04595fe947610706c X-Git-Newrev: 37c08d8e674a73174656f87e82d1b590ff771bcf X-Git-Rev: 37c08d8e674a73174656f87e82d1b590ff771bcf X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated archived-at: Tue, 19 Dec 2017 21:14:14 -0000 This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/master by this push: new 37c08d8 ACCUMULO-4766 Fix Monitor table stats 37c08d8 is described below commit 37c08d8e674a73174656f87e82d1b590ff771bcf Author: Mike Miller AuthorDate: Tue Dec 19 16:12:09 2017 -0500 ACCUMULO-4766 Fix Monitor table stats --- .../org/apache/accumulo/monitor/rest/tables/TablesResource.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java index 479b7f7..d0dae38 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java @@ -109,12 +109,12 @@ public class TablesResource { * @return Table list */ private static TablesList generateTables(TablesList tableNamespace) { - Instance inst = Monitor.getContext().getInstance(); - SortedMap tableStats = new TreeMap<>(); + SortedMap tableStats = new TreeMap<>(); if (Monitor.getMmi() != null && Monitor.getMmi().tableMap != null) for (Entry te : Monitor.getMmi().tableMap.entrySet()) - tableStats.put(Tables.getPrintableTableInfoFromId(inst, Table.ID.of(te.getKey())), te.getValue()); + tableStats.put(Table.ID.of(te.getKey()), te.getValue()); + Map compactingByTable = TableInfoUtil.summarizeTableStats(Monitor.getMmi()); TableManager tableManager = TableManager.getInstance(); List tables = new ArrayList<>(); @@ -123,7 +123,8 @@ public class TablesResource { for (Entry entry : Tables.getNameToIdMap(HdfsZooInstance.getInstance()).entrySet()) { String tableName = entry.getKey(); Table.ID tableId = entry.getValue(); - TableInfo tableInfo = tableStats.get(tableName); + TableInfo tableInfo = tableStats.get(tableId); + if (null != tableInfo) { Double holdTime = compactingByTable.get(tableId.canonicalID()); if (holdTime == null) -- To stop receiving notification emails like this one, please contact ['"commits@accumulo.apache.org" '].