Skip to content

HBASE-29292 Revise TestRecreateCluster #6981

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

Merged
taklwu merged 2 commits into from
May 15, 2025
Merged

HBASE-29292 Revise TestRecreateCluster #6981

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a150e5e
HBASE-29292 Revise TestRecreateCluster
taklwu May 7, 2025
c220764
spotless fix
taklwu May 13, 2025
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
67 changes: 25 additions & 42 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRecreateCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,22 @@
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.SingleProcessHBaseCluster;
import org.apache.hadoop.hbase.StartTestingClusterOption;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.Waiter;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.master.region.MasterRegionFactory;
import org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.CommonFSUtils;
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
Expand Down Expand Up @@ -72,9 +71,16 @@ public class TestRecreateCluster {
private static final long MASTER_INIT_TIMEOUT_MS = Duration.ofSeconds(45).toMillis();

@Before
public void setup() {
public void setup() throws Exception {
TEST_UTIL.getConfiguration().setLong("hbase.master.init.timeout.localHBaseCluster",
MASTER_INIT_TIMEOUT_MS);
TEST_UTIL.startMiniCluster(StartTestingClusterOption.builder().numRegionServers(NUM_RS)
.numDataNodes(NUM_RS).createWALDir(true).build());
}

@After
public void tearDown() throws Exception {
TEST_UTIL.shutdownMiniCluster();
}

@Test
Expand All @@ -89,44 +95,33 @@ public void testRecreateCluster_UserTableEnabled_ReuseWALsAndZNodes() throws Exc

@Test
public void testRecreateCluster_UserTableEnabled_CleanupZNodes() throws Exception {
// this is no longer failing and is a different behavior compared to branch-2
// this is no longer failing because master region stores the information the region servers
// as long as it's gracefully flushed before shutdown
validateRecreateClusterWithUserTableEnabled(false, true);
}

@Test(expected = IOException.class)
@Test
public void testRecreateCluster_UserTableEnabled_CleanupWALAndZNodes() throws Exception {
// master fails with InitMetaProcedure because it cannot delete existing meta table directory,
// region server cannot join and time-out the cluster starts.
validateRecreateClusterWithUserTableEnabled(true, true);
}

private void validateRecreateClusterWithUserDisabled(boolean cleanupWALs, boolean cleanUpZNodes)
throws Exception {
TEST_UTIL.startMiniCluster(NUM_RS);
try {
TableName tableName = TableName.valueOf("t1");
prepareDataBeforeRecreate(TEST_UTIL, tableName);
TEST_UTIL.getAdmin().disableTable(tableName);
TEST_UTIL.waitTableDisabled(tableName.getName());
restartHBaseCluster(cleanupWALs, cleanUpZNodes);
TEST_UTIL.getAdmin().enableTable(tableName);
validateDataAfterRecreate(TEST_UTIL, tableName);
} finally {
TEST_UTIL.shutdownMiniCluster();
}
TableName tableName = TableName.valueOf("t1");
prepareDataBeforeRecreate(TEST_UTIL, tableName);
TEST_UTIL.getAdmin().disableTable(tableName);
TEST_UTIL.waitTableDisabled(tableName.getName());
restartHBaseCluster(cleanupWALs, cleanUpZNodes);
TEST_UTIL.getAdmin().enableTable(tableName);
validateDataAfterRecreate(TEST_UTIL, tableName);
}

private void validateRecreateClusterWithUserTableEnabled(boolean cleanupWALs,
boolean cleanUpZNodes) throws Exception {
TEST_UTIL.startMiniCluster(NUM_RS);
try {
TableName tableName = TableName.valueOf("t1");
prepareDataBeforeRecreate(TEST_UTIL, tableName);
restartHBaseCluster(cleanupWALs, cleanUpZNodes);
validateDataAfterRecreate(TEST_UTIL, tableName);
} finally {
TEST_UTIL.shutdownMiniCluster();
}
TableName tableName = TableName.valueOf("t1");
prepareDataBeforeRecreate(TEST_UTIL, tableName);
restartHBaseCluster(cleanupWALs, cleanUpZNodes);
validateDataAfterRecreate(TEST_UTIL, tableName);
}

private void restartHBaseCluster(boolean cleanUpWALs, boolean cleanUpZnodes) throws Exception {
Expand All @@ -147,17 +142,7 @@ private void restartHBaseCluster(boolean cleanUpWALs, boolean cleanUpZnodes) thr
TEST_UTIL.shutdownMiniHBaseCluster();

if (cleanUpWALs) {
TEST_UTIL.getDFSCluster().getFileSystem()
.delete(new Path(rootDirPath, MasterRegionFactory.MASTER_STORE_DIR), true);
TEST_UTIL.getDFSCluster().getFileSystem()
.delete(new Path(walRootDirPath, MasterRegionFactory.MASTER_STORE_DIR), true);
TEST_UTIL.getDFSCluster().getFileSystem()
.delete(new Path(walRootDirPath, WALProcedureStore.MASTER_PROCEDURE_LOGDIR), true);

TEST_UTIL.getDFSCluster().getFileSystem()
.delete(new Path(walRootDirPath, HConstants.HREGION_LOGDIR_NAME), true);
TEST_UTIL.getDFSCluster().getFileSystem()
.delete(new Path(walRootDirPath, HConstants.HREGION_OLDLOGDIR_NAME), true);
TEST_UTIL.getDFSCluster().getFileSystem().delete(walRootDirPath, true);
}

if (cleanUpZnodes) {
Expand Down Expand Up @@ -200,7 +185,6 @@ private void ensureTableNotColocatedWithSystemTable(TableName userTable, TableNa
SingleProcessHBaseCluster hbaseCluster = TEST_UTIL.getHBaseCluster();
assertTrue("Please start more than 1 regionserver",
hbaseCluster.getRegionServerThreads().size() > 1);

int userTableServerNum = getServerNumForTableWithOnlyOneRegion(userTable);
int systemTableServerNum = getServerNumForTableWithOnlyOneRegion(systemTable);

Expand Down Expand Up @@ -241,5 +225,4 @@ private void validateDataAfterRecreate(HBaseTestingUtil testUtil, TableName tabl
Bytes.toString(cell.getValueArray(), cell.getValueOffset(), cell.getValueLength()));
assertFalse(result.advance());
}

}