Skip to content
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

HBASE-26055 Master local region "table" should be considered a system… #3447

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −1
Open

HBASE-26055 Master local region "table" should be considered a system… #3447

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
5 changes: 5 additions & 0 deletions hbase-common/src/main/java/org/apache/hadoop/hbase/NamespaceDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ public class NamespaceDescriptor {
public static final byte [] DEFAULT_NAMESPACE_NAME = Bytes.toBytes("default");
public static final String DEFAULT_NAMESPACE_NAME_STR =
Bytes.toString(DEFAULT_NAMESPACE_NAME);
/** Master local region namespace name. */
public static final byte [] MASTER_NAMESPACE_NAME = Bytes.toBytes("master");
public static final String MASTER_NAMESPACE_NAME_STR =
Bytes.toString(MASTER_NAMESPACE_NAME);

public static final NamespaceDescriptor DEFAULT_NAMESPACE = NamespaceDescriptor.create(
DEFAULT_NAMESPACE_NAME_STR).build();
Expand All @@ -58,6 +62,7 @@ public class NamespaceDescriptor {
Set<String> set = new HashSet<>();
set.add(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR);
set.add(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR);
set.add(NamespaceDescriptor.MASTER_NAMESPACE_NAME_STR);
RESERVED_NAMESPACES = Collections.unmodifiableSet(set);
}
public final static Set<byte[]> RESERVED_NAMESPACES_BYTES;
Expand Down
6 changes: 5 additions & 1 deletion 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 @@ -338,7 +338,11 @@ private TableName(ByteBuffer namespace, ByteBuffer qualifier) throws IllegalArgu
this.namespace = NamespaceDescriptor.SYSTEM_NAMESPACE_NAME;
this.namespaceAsString = NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR;
this.systemTable = true;
} else {
} else if (Bytes.equals(NamespaceDescriptor.MASTER_NAMESPACE_NAME, namespace)) {
this.namespace = NamespaceDescriptor.MASTER_NAMESPACE_NAME;
this.namespaceAsString = NamespaceDescriptor.MASTER_NAMESPACE_NAME_STR;
this.systemTable = true;
} else {
this.namespace = new byte[namespace.remaining()];
namespace.duplicate().get(this.namespace);
this.namespaceAsString = Bytes.toString(this.namespace);
Expand Down
9 changes: 9 additions & 0 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,15 @@ public void testDeleteReservedNS() throws Exception {
} finally {
assertTrue(exceptionCaught);
}

try {
admin.deleteNamespace(NamespaceDescriptor.MASTER_NAMESPACE_NAME_STR);
} catch (IOException exp) {
LOG.warn(exp.toString(), exp);
exceptionCaught = true;
} finally {
assertTrue(exceptionCaught);
}
}

@Test
Expand Down