-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HBASE-26641 Split TestMasterFailoverWithProcedures (#3994)
Signed-off-by: GeorryHuang <[email protected]>
- Loading branch information
Showing
7 changed files
with
487 additions
and
335 deletions.
There are no files selected for viewing
87 changes: 87 additions & 0 deletions
87
...t/java/org/apache/hadoop/hbase/master/procedure/MasterFailoverWithProceduresTestBase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.hadoop.hbase.master.procedure; | ||
|
||
import org.apache.hadoop.fs.Path; | ||
import org.apache.hadoop.hbase.HBaseTestingUtil; | ||
import org.apache.hadoop.hbase.StartTestingClusterOption; | ||
import org.apache.hadoop.hbase.procedure2.Procedure; | ||
import org.apache.hadoop.hbase.procedure2.ProcedureExecutor; | ||
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility; | ||
import org.junit.AfterClass; | ||
import org.junit.BeforeClass; | ||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
||
public abstract class MasterFailoverWithProceduresTestBase { | ||
|
||
private static final Logger LOG = | ||
LoggerFactory.getLogger(MasterFailoverWithProceduresTestBase.class); | ||
|
||
protected static final HBaseTestingUtil UTIL = new HBaseTestingUtil(); | ||
|
||
@BeforeClass | ||
public static void setUp() throws Exception { | ||
UTIL.getConfiguration().setInt(MasterProcedureConstants.MASTER_PROCEDURE_THREADS, 1); | ||
StartTestingClusterOption option = StartTestingClusterOption.builder().numMasters(2).build(); | ||
UTIL.startMiniCluster(option); | ||
|
||
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor(); | ||
ProcedureTestingUtility.setToggleKillBeforeStoreUpdate(procExec, false); | ||
ProcedureTestingUtility.setKillBeforeStoreUpdate(procExec, false); | ||
} | ||
|
||
@AfterClass | ||
public static void tearDown() throws Exception { | ||
UTIL.shutdownMiniCluster(); | ||
} | ||
|
||
// ========================================================================== | ||
// Helpers | ||
// ========================================================================== | ||
protected static ProcedureExecutor<MasterProcedureEnv> getMasterProcedureExecutor() { | ||
return UTIL.getHBaseCluster().getMaster().getMasterProcedureExecutor(); | ||
} | ||
|
||
protected static Path getRootDir() { | ||
return UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getRootDir(); | ||
} | ||
|
||
protected static void testRecoveryAndDoubleExecution(final HBaseTestingUtil testUtil, | ||
final long procId, final int lastStepBeforeFailover) throws Exception { | ||
ProcedureExecutor<MasterProcedureEnv> procExec = | ||
testUtil.getHBaseCluster().getMaster().getMasterProcedureExecutor(); | ||
ProcedureTestingUtility.waitProcedure(procExec, procId); | ||
|
||
final Procedure<?> proc = procExec.getProcedure(procId); | ||
for (int i = 0; i < lastStepBeforeFailover; ++i) { | ||
LOG.info("Restart " + i + " exec state: " + proc); | ||
ProcedureTestingUtility.assertProcNotYetCompleted(procExec, procId); | ||
MasterProcedureTestingUtility.restartMasterProcedureExecutor(procExec); | ||
ProcedureTestingUtility.waitProcedure(procExec, procId); | ||
} | ||
ProcedureTestingUtility.assertProcNotYetCompleted(procExec, procId); | ||
|
||
LOG.info("Trigger master failover"); | ||
MasterProcedureTestingUtility.masterFailover(testUtil); | ||
|
||
procExec = testUtil.getHBaseCluster().getMaster().getMasterProcedureExecutor(); | ||
ProcedureTestingUtility.waitProcedure(procExec, procId); | ||
ProcedureTestingUtility.assertProcNotFailed(procExec, procId); | ||
} | ||
} |
74 changes: 74 additions & 0 deletions
74
...test/java/org/apache/hadoop/hbase/master/procedure/TestCreateTableWithMasterFailover.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.hadoop.hbase.master.procedure; | ||
|
||
import org.apache.hadoop.hbase.HBaseClassTestRule; | ||
import org.apache.hadoop.hbase.TableName; | ||
import org.apache.hadoop.hbase.client.RegionInfo; | ||
import org.apache.hadoop.hbase.client.TableDescriptor; | ||
import org.apache.hadoop.hbase.procedure2.ProcedureExecutor; | ||
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility; | ||
import org.apache.hadoop.hbase.testclassification.MasterTests; | ||
import org.apache.hadoop.hbase.testclassification.MediumTests; | ||
import org.apache.hadoop.hbase.util.ModifyRegionUtils; | ||
import org.junit.ClassRule; | ||
import org.junit.Test; | ||
import org.junit.experimental.categories.Category; | ||
|
||
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.CreateTableState; | ||
|
||
@Category({ MasterTests.class, MediumTests.class }) | ||
public class TestCreateTableWithMasterFailover extends MasterFailoverWithProceduresTestBase { | ||
|
||
@ClassRule | ||
public static final HBaseClassTestRule CLASS_RULE = | ||
HBaseClassTestRule.forClass(TestCreateTableWithMasterFailover.class); | ||
|
||
// ========================================================================== | ||
// Test Create Table | ||
// ========================================================================== | ||
@Test | ||
public void testCreateWithFailover() throws Exception { | ||
// TODO: Should we try every step? (master failover takes long time) | ||
// It is already covered by TestCreateTableProcedure | ||
// but without the master restart, only the executor/store is restarted. | ||
// Without Master restart we may not find bug in the procedure code | ||
// like missing "wait" for resources to be available (e.g. RS) | ||
testCreateWithFailoverAtStep(CreateTableState.CREATE_TABLE_ASSIGN_REGIONS.ordinal()); | ||
} | ||
|
||
private void testCreateWithFailoverAtStep(final int step) throws Exception { | ||
final TableName tableName = TableName.valueOf("testCreateWithFailoverAtStep" + step); | ||
|
||
// create the table | ||
ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor(); | ||
ProcedureTestingUtility.setKillBeforeStoreUpdate(procExec, true); | ||
ProcedureTestingUtility.setToggleKillBeforeStoreUpdate(procExec, true); | ||
|
||
// Start the Create procedure && kill the executor | ||
byte[][] splitKeys = null; | ||
TableDescriptor htd = MasterProcedureTestingUtility.createHTD(tableName, "f1", "f2"); | ||
RegionInfo[] regions = ModifyRegionUtils.createRegionInfos(htd, splitKeys); | ||
long procId = | ||
procExec.submitProcedure(new CreateTableProcedure(procExec.getEnvironment(), htd, regions)); | ||
testRecoveryAndDoubleExecution(UTIL, procId, step); | ||
|
||
MasterProcedureTestingUtility.validateTableCreation(UTIL.getHBaseCluster().getMaster(), | ||
tableName, regions, "f1", "f2"); | ||
} | ||
} |
76 changes: 76 additions & 0 deletions
76
...test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteTableWithMasterFailover.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.hadoop.hbase.master.procedure; | ||
|
||
import org.apache.hadoop.hbase.HBaseClassTestRule; | ||
import org.apache.hadoop.hbase.TableName; | ||
import org.apache.hadoop.hbase.client.RegionInfo; | ||
import org.apache.hadoop.hbase.procedure2.ProcedureExecutor; | ||
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility; | ||
import org.apache.hadoop.hbase.testclassification.MasterTests; | ||
import org.apache.hadoop.hbase.testclassification.MediumTests; | ||
import org.junit.ClassRule; | ||
import org.junit.Test; | ||
import org.junit.experimental.categories.Category; | ||
|
||
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.DeleteTableState; | ||
|
||
@Category({ MasterTests.class, MediumTests.class }) | ||
public class TestDeleteTableWithMasterFailover extends MasterFailoverWithProceduresTestBase { | ||
|
||
@ClassRule | ||
public static final HBaseClassTestRule CLASS_RULE = | ||
HBaseClassTestRule.forClass(TestDeleteTableWithMasterFailover.class); | ||
|
||
// ========================================================================== | ||
// Test Delete Table | ||
// ========================================================================== | ||
@Test | ||
public void testDeleteWithFailover() throws Exception { | ||
// TODO: Should we try every step? (master failover takes long time) | ||
// It is already covered by TestDeleteTableProcedure | ||
// but without the master restart, only the executor/store is restarted. | ||
// Without Master restart we may not find bug in the procedure code | ||
// like missing "wait" for resources to be available (e.g. RS) | ||
testDeleteWithFailoverAtStep(DeleteTableState.DELETE_TABLE_UNASSIGN_REGIONS.ordinal()); | ||
} | ||
|
||
private void testDeleteWithFailoverAtStep(final int step) throws Exception { | ||
final TableName tableName = TableName.valueOf("testDeleteWithFailoverAtStep" + step); | ||
|
||
// create the table | ||
byte[][] splitKeys = null; | ||
RegionInfo[] regions = MasterProcedureTestingUtility.createTable(getMasterProcedureExecutor(), | ||
tableName, splitKeys, "f1", "f2"); | ||
MasterProcedureTestingUtility.validateTableCreation(UTIL.getHBaseCluster().getMaster(), | ||
tableName, regions, "f1", "f2"); | ||
UTIL.getAdmin().disableTable(tableName); | ||
|
||
ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor(); | ||
ProcedureTestingUtility.setKillBeforeStoreUpdate(procExec, true); | ||
ProcedureTestingUtility.setToggleKillBeforeStoreUpdate(procExec, true); | ||
|
||
// Start the Delete procedure && kill the executor | ||
long procId = | ||
procExec.submitProcedure(new DeleteTableProcedure(procExec.getEnvironment(), tableName)); | ||
testRecoveryAndDoubleExecution(UTIL, procId, step); | ||
|
||
MasterProcedureTestingUtility.validateTableDeletion(UTIL.getHBaseCluster().getMaster(), | ||
tableName); | ||
} | ||
} |
74 changes: 74 additions & 0 deletions
74
...est/java/org/apache/hadoop/hbase/master/procedure/TestDisableTableWithMasterFailover.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.hadoop.hbase.master.procedure; | ||
|
||
import org.apache.hadoop.hbase.HBaseClassTestRule; | ||
import org.apache.hadoop.hbase.TableName; | ||
import org.apache.hadoop.hbase.procedure2.ProcedureExecutor; | ||
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility; | ||
import org.apache.hadoop.hbase.testclassification.MasterTests; | ||
import org.apache.hadoop.hbase.testclassification.MediumTests; | ||
import org.apache.hadoop.hbase.util.Bytes; | ||
import org.junit.ClassRule; | ||
import org.junit.Test; | ||
import org.junit.experimental.categories.Category; | ||
|
||
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.DisableTableState; | ||
|
||
@Category({ MasterTests.class, MediumTests.class }) | ||
public class TestDisableTableWithMasterFailover extends MasterFailoverWithProceduresTestBase { | ||
|
||
@ClassRule | ||
public static final HBaseClassTestRule CLASS_RULE = | ||
HBaseClassTestRule.forClass(TestDisableTableWithMasterFailover.class); | ||
|
||
// ========================================================================== | ||
// Test Disable Table | ||
// ========================================================================== | ||
@Test | ||
public void testDisableTableWithFailover() throws Exception { | ||
// TODO: Should we try every step? (master failover takes long time) | ||
// It is already covered by TestDisableTableProcedure | ||
// but without the master restart, only the executor/store is restarted. | ||
// Without Master restart we may not find bug in the procedure code | ||
// like missing "wait" for resources to be available (e.g. RS) | ||
testDisableTableWithFailoverAtStep( | ||
DisableTableState.DISABLE_TABLE_MARK_REGIONS_OFFLINE.ordinal()); | ||
} | ||
|
||
private void testDisableTableWithFailoverAtStep(final int step) throws Exception { | ||
final TableName tableName = TableName.valueOf("testDisableTableWithFailoverAtStep" + step); | ||
|
||
// create the table | ||
final byte[][] splitKeys = | ||
new byte[][] { Bytes.toBytes("a"), Bytes.toBytes("b"), Bytes.toBytes("c") }; | ||
MasterProcedureTestingUtility.createTable(getMasterProcedureExecutor(), tableName, splitKeys, | ||
"f1", "f2"); | ||
|
||
ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor(); | ||
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true); | ||
|
||
// Start the Delete procedure && kill the executor | ||
long procId = procExec | ||
.submitProcedure(new DisableTableProcedure(procExec.getEnvironment(), tableName, false)); | ||
testRecoveryAndDoubleExecution(UTIL, procId, step); | ||
|
||
MasterProcedureTestingUtility.validateTableIsDisabled(UTIL.getHBaseCluster().getMaster(), | ||
tableName); | ||
} | ||
} |
74 changes: 74 additions & 0 deletions
74
...test/java/org/apache/hadoop/hbase/master/procedure/TestEnableTableWithMasterFailover.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.hadoop.hbase.master.procedure; | ||
|
||
import org.apache.hadoop.hbase.HBaseClassTestRule; | ||
import org.apache.hadoop.hbase.TableName; | ||
import org.apache.hadoop.hbase.procedure2.ProcedureExecutor; | ||
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility; | ||
import org.apache.hadoop.hbase.testclassification.MasterTests; | ||
import org.apache.hadoop.hbase.testclassification.MediumTests; | ||
import org.apache.hadoop.hbase.util.Bytes; | ||
import org.junit.ClassRule; | ||
import org.junit.Test; | ||
import org.junit.experimental.categories.Category; | ||
|
||
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.EnableTableState; | ||
|
||
@Category({ MasterTests.class, MediumTests.class }) | ||
public class TestEnableTableWithMasterFailover extends MasterFailoverWithProceduresTestBase { | ||
|
||
@ClassRule | ||
public static final HBaseClassTestRule CLASS_RULE = | ||
HBaseClassTestRule.forClass(TestEnableTableWithMasterFailover.class); | ||
|
||
// ========================================================================== | ||
// Test Enable Table | ||
// ========================================================================== | ||
@Test | ||
public void testEnableTableWithFailover() throws Exception { | ||
// TODO: Should we try every step? (master failover takes long time) | ||
// It is already covered by TestEnableTableProcedure | ||
// but without the master restart, only the executor/store is restarted. | ||
// Without Master restart we may not find bug in the procedure code | ||
// like missing "wait" for resources to be available (e.g. RS) | ||
testEnableTableWithFailoverAtStep(EnableTableState.ENABLE_TABLE_MARK_REGIONS_ONLINE.ordinal()); | ||
} | ||
|
||
private void testEnableTableWithFailoverAtStep(final int step) throws Exception { | ||
final TableName tableName = TableName.valueOf("testEnableTableWithFailoverAtStep" + step); | ||
|
||
// create the table | ||
final byte[][] splitKeys = | ||
new byte[][] { Bytes.toBytes("a"), Bytes.toBytes("b"), Bytes.toBytes("c") }; | ||
MasterProcedureTestingUtility.createTable(getMasterProcedureExecutor(), tableName, splitKeys, | ||
"f1", "f2"); | ||
UTIL.getAdmin().disableTable(tableName); | ||
|
||
ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor(); | ||
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true); | ||
|
||
// Start the Delete procedure && kill the executor | ||
long procId = | ||
procExec.submitProcedure(new EnableTableProcedure(procExec.getEnvironment(), tableName)); | ||
testRecoveryAndDoubleExecution(UTIL, procId, step); | ||
|
||
MasterProcedureTestingUtility.validateTableIsEnabled(UTIL.getHBaseCluster().getMaster(), | ||
tableName); | ||
} | ||
} |
Oops, something went wrong.