Repository: hbase Updated Branches: refs/heads/branch-1 97fc7abd5 -> 6a2fa739f
HBASE-15209 (compatibility) Disable table in HBaseTestingUtility.truncateTable. (Apekshit) Signed-off-by: stack <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6a2fa739 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6a2fa739 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6a2fa739 Branch: refs/heads/branch-1 Commit: 6a2fa739fd9238b62d6e68ca642711b2383cb4f8 Parents: 97fc7ab Author: Apekshit <[email protected]> Authored: Wed Feb 3 16:05:37 2016 -0800 Committer: stack <[email protected]> Committed: Fri Feb 5 20:42:26 2016 -0800 ---------------------------------------------------------------------- .../test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6a2fa739/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index 44a27ba..ae59df3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -2112,6 +2112,9 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { public HTable truncateTable(final TableName tableName, final boolean preserveRegions) throws IOException { Admin admin = getHBaseAdmin(); + if (!admin.isTableDisabled(tableName)) { + admin.disableTable(tableName); + } admin.truncateTable(tableName, preserveRegions); return new HTable(getConfiguration(), tableName); }
