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 2C29A200CF7 for ; Tue, 5 Sep 2017 06:12:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2AB76164C67; Tue, 5 Sep 2017 04:12:14 +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 72A5F164C22 for ; Tue, 5 Sep 2017 06:12:13 +0200 (CEST) Received: (qmail 17746 invoked by uid 500); 5 Sep 2017 04:12:12 -0000 Mailing-List: contact dev-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list dev@hbase.apache.org Received: (qmail 17725 invoked by uid 99); 5 Sep 2017 04:12:12 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Sep 2017 04:12:12 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 814781A226C for ; Tue, 5 Sep 2017 04:12:11 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -100.002 X-Spam-Level: X-Spam-Status: No, score=-100.002 tagged_above=-999 required=6.31 tests=[RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001, USER_IN_WHITELIST=-100] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id GJWq3YASRh7G for ; Tue, 5 Sep 2017 04:12:06 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 0CE905FACE for ; Tue, 5 Sep 2017 04:12:06 +0000 (UTC) Received: from jira-lw-us.apache.org (unknown [207.244.88.139]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 41A11E0EDB for ; Tue, 5 Sep 2017 04:12:04 +0000 (UTC) Received: from jira-lw-us.apache.org (localhost [127.0.0.1]) by jira-lw-us.apache.org (ASF Mail Server at jira-lw-us.apache.org) with ESMTP id 85C522415B for ; Tue, 5 Sep 2017 04:12:01 +0000 (UTC) Date: Tue, 5 Sep 2017 04:12:01 +0000 (UTC) From: "stack (JIRA)" To: dev@hbase.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Resolved] (HBASE-18736) Cleanup the HTD/HCD for Admin MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 archived-at: Tue, 05 Sep 2017 04:12:14 -0000 [ https://issues.apache.org/jira/browse/HBASE-18736?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] stack resolved HBASE-18736. --------------------------- Resolution: Fixed Re-resolving. I pushed the above addendum on master and branch-2: {code} commit e778fbc059fbe99222aef8e578090c8092fa1bda Author: Michael Stack Date: Mon Sep 4 21:09:04 2017 -0700 HBASE-18736 Cleanup the HTD/HCD for Admin; ADDENDUM diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java index 8c07a54c91..bf2064671c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java @@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.tool; import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.testclassification.MediumTests; @@ -113,7 +114,8 @@ public class TestCanaryTool { ToolRunner.run(testingUtility.getConfiguration(), canary, args); assertEquals("verify no read error count", 0, canary.getReadFailures().size()); assertEquals("verify no write error count", 0, canary.getWriteFailures().size()); - verify(sink, atLeastOnce()).publishReadTiming(isA(ServerName.class), isA(HRegionInfo.class), isA(HColumnDescriptor.class), anyLong()); + verify(sink, atLeastOnce()).publishReadTiming(isA(ServerName.class), isA(HRegionInfo.class), + isA(ColumnFamilyDescriptor.class), anyLong()); } @Test @@ -217,11 +219,13 @@ public class TestCanaryTool { Canary.RegionStdOutSink sink = spy(new Canary.RegionStdOutSink()); Canary canary = new Canary(executor, sink); String[] args = { "-t", "10000", name.getMethodName() }; - org.apache.hadoop.conf.Configuration conf = new org.apache.hadoop.conf.Configuration(testingUtility.getConfiguration()); + org.apache.hadoop.conf.Configuration conf = + new org.apache.hadoop.conf.Configuration(testingUtility.getConfiguration()); conf.setBoolean(HConstants.HBASE_CANARY_READ_RAW_SCAN_KEY, true); ToolRunner.run(conf, canary, args); verify(sink, atLeastOnce()) - .publishReadTiming(isA(ServerName.class), isA(HRegionInfo.class), isA(HColumnDescriptor.class), anyLong()); + .publishReadTiming(isA(ServerName.class), isA(HRegionInfo.class), + isA(ColumnFamilyDescriptor.class), anyLong()); assertEquals("verify no read error count", 0, canary.getReadFailures().size()); } {code} > Cleanup the HTD/HCD for Admin > ----------------------------- > > Key: HBASE-18736 > URL: https://issues.apache.org/jira/browse/HBASE-18736 > Project: HBase > Issue Type: Sub-task > Reporter: Chia-Ping Tsai > Assignee: Chia-Ping Tsai > Fix For: 2.0.0-alpha-3 > > Attachments: HBASE-18736.v0.patch > > > see the [discussion|https://issues.apache.org/jira/browse/HBASE-18729?focusedCommentId=16150675&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16150675] in HBASE-18729. -- This message was sent by Atlassian JIRA (v6.4.14#64029)