HDDS-11989. Enable SCM Ratis in tests related to DeletedBlockLog

[chungen0126]

What changes were proposed in this pull request?

Tests related to DeletedBlockLog needs to be tweaked to work with SCM Ratis enabled:

Error:  Tests run: 4, Failures: 0, Errors: 4, Skipped: 0, Time elapsed: 225.079 s <<< FAILURE! - in org.apache.hadoop.ozone.container.common.statemachine.commandhandler.TestBlockDeletion
20468Error:  org.apache.hadoop.ozone.container.common.statemachine.commandhandler.TestBlockDeletion.testBlockDeleteCommandParallelProcess  Time elapsed: 45.39 s  <<< ERROR!

Error:  Tests run: 1, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 65.86 s <<< FAILURE! - in org.apache.hadoop.ozone.client.rpc.TestDeleteWithInAdequateDN
2897Error:  org.apache.hadoop.ozone.client.rpc.TestDeleteWithInAdequateDN.testDeleteKeyWithInAdequateDN  Time elapsed: 27.673 s  <<< FAILURE!
2898org.opentest4j.AssertionFailedError: Expected org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException to be thrown, but nothing was thrown.
	at org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:152)
	at org.junit.jupiter.api.AssertThrows.assertThrows(AssertThrows.java:73)
	at org.junit.jupiter.api.AssertThrows.assertThrows(AssertThrows.java:35)
	at org.junit.jupiter.api.Assertions.assertThrows(Assertions.java:3128)
	at org.apache.hadoop.ozone.client.rpc.TestDeleteWithInAdequateDN.testDeleteKeyWithInAdequateDN(TestDeleteWithInAdequateDN.java:314)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)

Error:  Tests run: 6, Failures: 0, Errors: 3, Skipped: 0, Time elapsed: 108.02 s <<< FAILURE! - in org.apache.hadoop.ozone.container.common.statemachine.commandhandler.TestDeleteContainerHandler
3162Error:  org.apache.hadoop.ozone.container.common.statemachine.commandhandler.TestDeleteContainerHandler.testDeleteContainerRequestHandlerOnClosedContainer  Time elapsed: 16.098 s  <<< ERROR!

What is the link to the Apache JIRA

https://issues.apache.org/jira/browse/HDDS-11989

How was this patch tested?

CI:
https://github.com/chungen0126/ozone/actions/runs/12570960386

[jojochuang]

Out of scope of this PR but I guess this test https://github.com/apache/ozone/blob/master/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java#L324-L334
can be rewritten using the new utility method here.

Can be done as part of HDDS-11867

[jojochuang]

PR makes sense. Is it ready for review?

[chungen0126]

PR makes sense. Is it ready for review?

Thanks @jojochuang for the review. Marked it as ready for review.

[jojochuang]

hmm this isn't an exact replacement because OzoneTestUtils.waitBlockDeleted() doesn't flush SCMHADBTransactionBuffer

[chungen0126]

This place is for waiting blocks to be deleted. The test flush SCMHADBTransactionBuffer while creating delete transaction log. See

ozone/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManager.java

Lines 989 to 997 in dcbc136

	private void addTransactions(StorageContainerManager scm,
	DeletedBlockLog delLog,
	Map<Long, List<Long>> containerBlocksMap)
	throws IOException, TimeoutException {
	delLog.addTransactions(containerBlocksMap);
	if (SCMHAUtils.isSCMHAEnabled(scm.getConfiguration())) {
	scm.getScmHAManager().asSCMHADBTransactionBuffer().flush();
	}
	}

[jojochuang]

Ah ok

[jojochuang]

+1

[jojochuang]

Thanks @chungen0126