Skip to content

HBASE-29992: Implement regex check for configured replica suffix #7923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kota-SH wants to merge 1 commit into
base: HBASE-29081_rebased
Choose a base branch
from
+30 −0
Open

HBASE-29992: Implement regex check for configured replica suffix #7923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ public final class TableName implements Comparable<TableName> {
// with NAMESPACE_DELIM as delimiter
public static final String VALID_USER_TABLE_REGEX = "(?:(?:(?:" + VALID_NAMESPACE_REGEX + "\\"
+ NAMESPACE_DELIM + ")?)" + "(?:" + VALID_TABLE_QUALIFIER_REGEX + "))";
public static final String VALID_META_TABLE_SUFFIX_REGEX = "[a-zA-Z0-9]+";

/**
* The name of hbase meta table could either be hbase:meta_xxx or 'hbase:meta' otherwise. Config
Expand All @@ -96,6 +97,11 @@ public static TableName initializeHbaseMetaTableName(Configuration conf) {
if (Strings.isNullOrEmpty(suffix_val)) {
return valueOf(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR, "meta");
} else {
if (!suffix_val.matches(VALID_META_TABLE_SUFFIX_REGEX)) {
throw new IllegalArgumentException("Invalid value '" + suffix_val + "' for config '"
+ HConstants.HBASE_META_TABLE_SUFFIX + "'. Suffix must only contain ASCII letters and "
+ "digits matching: " + VALID_META_TABLE_SUFFIX_REGEX);
}
return valueOf(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR, "meta_" + suffix_val);
}
}
Expand Down
24 changes: 24 additions & 0 deletions hbase-common/src/test/java/org/apache/hadoop/hbase/TestTableName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.Bytes;
Expand Down Expand Up @@ -164,4 +165,27 @@ private TableName validateNames(TableName expected, Names names) {
assertArrayEquals(expected.getNamespace(), names.nsb);
return expected;
}

@Test
public void testValidMetaTableSuffix() {
String[] validSuffixes = { "REPL1", "123", "123abc" };
for (String suffix : validSuffixes) {
Configuration conf = HBaseConfiguration.create();
conf.set(HConstants.HBASE_META_TABLE_SUFFIX, suffix);
TableName metaTableName = TableName.initializeHbaseMetaTableName(conf);
assertEquals("hbase:meta_" + suffix, metaTableName.getNameAsString());
}
}

@Test
public void testInvalidMetaTableSuffix() {
String[] invalidSuffixes = { "test_1", "test-1", "test.1", "test 1", "_test",
"-test", ".test", "has!special", "has:colon", " " };
for (String suffix : invalidSuffixes) {
Configuration conf = HBaseConfiguration.create();
conf.set(HConstants.HBASE_META_TABLE_SUFFIX, suffix);
assertThrows("Expected IllegalArgumentException for suffix: " + suffix,
IllegalArgumentException.class, () -> TableName.initializeHbaseMetaTableName(conf));
}
}
}
Loading