Skip to content

Commit 709e203

Browse files
author
Ray Mattingly
committed
HBASE-29207 The backup system table should be considered a system table
1 parent 67cc820 commit 709e203

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupRestoreConstants.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.apache.hadoop.hbase.backup;
1919

2020
import org.apache.hadoop.hbase.HConstants;
21+
import org.apache.hadoop.hbase.NamespaceDescriptor;
2122
import org.apache.yetus.audience.InterfaceAudience;
2223

2324
/**
@@ -29,7 +30,7 @@ public interface BackupRestoreConstants {
2930
* Backup/Restore constants
3031
*/
3132
String BACKUP_SYSTEM_TABLE_NAME_KEY = "hbase.backup.system.table.name";
32-
String BACKUP_SYSTEM_TABLE_NAME_DEFAULT = "backup:system";
33+
String BACKUP_SYSTEM_TABLE_NAME_DEFAULT = NamespaceDescriptor.BACKUP_NAMESPACE_NAME_STR + ":system";
3334

3435
String BACKUP_SYSTEM_TTL_KEY = "hbase.backup.system.ttl";
3536

hbase-common/src/main/java/org/apache/hadoop/hbase/NamespaceDescriptor.java

+3
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ public class NamespaceDescriptor {
4141
/** Default namespace name. */
4242
public static final byte[] DEFAULT_NAMESPACE_NAME = Bytes.toBytes("default");
4343
public static final String DEFAULT_NAMESPACE_NAME_STR = Bytes.toString(DEFAULT_NAMESPACE_NAME);
44+
/** Backup namespace name. */
45+
public static final byte[] BACKUP_NAMESPACE_NAME = Bytes.toBytes("backup");
46+
public static final String BACKUP_NAMESPACE_NAME_STR = Bytes.toString(BACKUP_NAMESPACE_NAME);
4447

4548
public static final NamespaceDescriptor DEFAULT_NAMESPACE =
4649
NamespaceDescriptor.create(DEFAULT_NAMESPACE_NAME_STR).build();

hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java

+4
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,10 @@ private TableName(ByteBuffer namespace, ByteBuffer qualifier) throws IllegalArgu
301301
this.namespace = NamespaceDescriptor.SYSTEM_NAMESPACE_NAME;
302302
this.namespaceAsString = NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR;
303303
this.systemTable = true;
304+
} else if (Bytes.equals(NamespaceDescriptor.BACKUP_NAMESPACE_NAME, namespace)) {
305+
this.namespace = NamespaceDescriptor.BACKUP_NAMESPACE_NAME;
306+
this.namespaceAsString = NamespaceDescriptor.BACKUP_NAMESPACE_NAME_STR;
307+
this.systemTable = true;
304308
} else {
305309
this.namespace = new byte[namespace.remaining()];
306310
namespace.duplicate().get(this.namespace);

0 commit comments

Comments
 (0)