From 3ee0e01beda4494622cf15c6259f685647fdc5c7 Mon Sep 17 00:00:00 2001 From: Yuhao Bi Date: Fri, 29 May 2015 20:42:59 +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 40d34e9..bcb652b 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 @@ -1466,6 +1466,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 <= maxVerions + if (hcd.getMinVersions() > hcd.getMaxVersions()) { + String message = "Min versions for column family " + hcd.getNameAsString() + + " must be less than the Max versions."; + warnOrThrowExceptionForFailure(logWarn, CONF_KEY, message, null); + } + // check replication scope if (hcd.getScope() < 0) { String message = "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 3dc1387..5ca2b92 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 @@ -5471,6 +5471,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)