You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/09/05 04:09:59 UTC
hbase git commit: HBASE-18736 Cleanup the HTD/HCD for Admin; ADDENDUM
Repository: hbase
Updated Branches:
refs/heads/master bea5de02b -> 8ec5d59a0
HBASE-18736 Cleanup the HTD/HCD for Admin; ADDENDUM
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8ec5d59a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8ec5d59a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8ec5d59a
Branch: refs/heads/master
Commit: 8ec5d59a081a6bc70692241b373cbbf2aacaf1f5
Parents: bea5de0
Author: Michael Stack <st...@apache.org>
Authored: Mon Sep 4 21:09:04 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Mon Sep 4 21:09:04 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/tool/TestCanaryTool.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/8ec5d59a/hbase-server/src/test/java/org/apache/hadoop/hbase/tool/TestCanaryTool.java
----------------------------------------------------------------------
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 8c07a54..bf20646 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());
}