[ 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 <st...@apache.org> 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)