Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-21052 After restoring a snapshot, table.jsp page for the table gets stuck

This commit is contained in:
Toshihiro Suzuki 2018-08-21 16:26:16 +09:00
parent b04b4b0fd1
commit a51c333856
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
View File

@ -3310,9 +3310,16 @@ public class HBaseAdmin implements Admin {
@Override @Override
public CompactionState getCompactionState(final TableName tableName, CompactType compactType) public CompactionState getCompactionState(final TableName tableName, CompactType compactType)
throws IOException { throws IOException {
checkTableExists(tableName);
if (!isTableEnabled(tableName)) {
// If the table is disabled, the compaction state of the table should always be NONE
return ProtobufUtil.createCompactionState(
AdminProtos.GetRegionInfoResponse.CompactionState.NONE);
}
AdminProtos.GetRegionInfoResponse.CompactionState state = AdminProtos.GetRegionInfoResponse.CompactionState state =
AdminProtos.GetRegionInfoResponse.CompactionState.NONE; AdminProtos.GetRegionInfoResponse.CompactionState.NONE;
checkTableExists(tableName);
// TODO: There is no timeout on this controller. Set one! // TODO: There is no timeout on this controller. Set one!
HBaseRpcController rpcController = rpcControllerFactory.newController(); HBaseRpcController rpcController = rpcControllerFactory.newController();
switch (compactType) { switch (compactType) {

23
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java
View File

@ -247,7 +247,8 @@ public class TestRestoreSnapshotFromClient {
@Test @Test
public void testCloneSnapshotOfCloned() throws IOException, InterruptedException { public void testCloneSnapshotOfCloned() throws IOException, InterruptedException {
TableName clonedTableName = TableName.valueOf(name.getMethodName() + "-" + System.currentTimeMillis()); TableName clonedTableName = TableName.valueOf(name.getMethodName() + "-" +
System.currentTimeMillis());
admin.cloneSnapshot(snapshotName0, clonedTableName); admin.cloneSnapshot(snapshotName0, clonedTableName);
verifyRowCount(TEST_UTIL, clonedTableName, snapshot0Rows); verifyRowCount(TEST_UTIL, clonedTableName, snapshot0Rows);
SnapshotTestingUtils.verifyReplicasCameOnline(clonedTableName, admin, getNumReplicas()); SnapshotTestingUtils.verifyReplicasCameOnline(clonedTableName, admin, getNumReplicas());
@ -282,7 +283,8 @@ public class TestRestoreSnapshotFromClient {
@Test @Test
public void testCorruptedSnapshot() throws IOException, InterruptedException { public void testCorruptedSnapshot() throws IOException, InterruptedException {
SnapshotTestingUtils.corruptSnapshot(TEST_UTIL, Bytes.toString(snapshotName0)); SnapshotTestingUtils.corruptSnapshot(TEST_UTIL, Bytes.toString(snapshotName0));
TableName cloneName = TableName.valueOf(name.getMethodName() + "-" + System.currentTimeMillis()); TableName cloneName = TableName.valueOf(name.getMethodName() + "-" +
System.currentTimeMillis());
try { try {
admin.cloneSnapshot(snapshotName0, cloneName); admin.cloneSnapshot(snapshotName0, cloneName);
fail("Expected CorruptedSnapshotException, got succeeded cloneSnapshot()"); fail("Expected CorruptedSnapshotException, got succeeded cloneSnapshot()");
@ -342,6 +344,23 @@ public class TestRestoreSnapshotFromClient {
SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas()); SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas());
} }
@Test(timeout = 30000)
public void testGetCompactionStateAfterRestoringSnapshot() throws IOException,
InterruptedException {
// Take a snapshot
admin.snapshot(snapshotName1, tableName);
// Restore the snapshot
admin.disableTable(tableName);
admin.restoreSnapshot(snapshotName1);
// Get the compaction state of the restored table
CompactionState compactionState = admin.getCompactionState(tableName);
// The compactionState should be NONE because the table is disabled
assertEquals(CompactionState.NONE, compactionState);
}
// ========================================================================== // ==========================================================================
// Helpers // Helpers
// ========================================================================== // ==========================================================================