From 82e4c9aa6a98856f061248e5ef0d560dc077e37e Mon Sep 17 00:00:00 2001 From: Yuhao Bi Date: Sat, 30 May 2015 01:47:45 +0800 Subject: [PATCH] HBASE-13776 Setting illegal versions for HColumnDescriptor does not throw IllegalArgumentException (Yuhao Bi) Should check minVersions <= maxVersions in HMaster. --- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 9 +++++++++ .../java/org/apache/hadoop/hbase/client/TestFromClientSide.java | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index bc30e26..88dcd1e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -1376,6 +1376,15 @@ public class HMaster extends HRegionServer implements MasterServices, Server { } // max versions already being checked + // HBASE-13776 Setting illegal versions for HColumnDescriptor + // does not throw IllegalArgumentException + // check minVersions <= maxVersions + if (hcd.getMinVersions() > hcd.getMaxVersions()) { + throw new DoNotRetryIOException("Min versions for column family " + hcd.getNameAsString() + + " must be less than the Max versions. Set " + CONF_KEY + " to false at conf or table " + + "descriptor if you want to bypass sanity checks"); + } + // check replication scope if (hcd.getScope() < 0) { throw new DoNotRetryIOException("Replication scope for column family " diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java index f1eb053..85c0475 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java @@ -5559,6 +5559,14 @@ public class TestFromClientSide { } checkTableIsLegal(htd); + // HBASE-13776 Setting illegal versions for HColumnDescriptor + // does not throw IllegalArgumentException + // finally, minVersions must be less than or equal to maxVersions + hcd.setMaxVersions(4); + hcd.setMinVersions(5); + checkTableIsIllegal(htd); + hcd.setMinVersions(3); + hcd.setScope(-1); checkTableIsIllegal(htd); hcd.setScope(0); -- 2.3.2 (Apple Git-55)