This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new b4d7e79b280 HDDS-14098. MiniOzoneCluster not shutdown in some tests
(#9451)
b4d7e79b280 is described below
commit b4d7e79b280b376dad4752213180adb7497068b1
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Dec 11 09:28:19 2025 +0100
HDDS-14098. MiniOzoneCluster not shutdown in some tests (#9451)
---
.../test/java/org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java | 5 ++---
.../src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java | 5 ++---
.../src/test/java/org/apache/hadoop/ozone/TestBlockTokens.java | 5 +----
.../src/test/java/org/apache/hadoop/ozone/TestBlockTokensCLI.java | 5 +----
.../hadoop/ozone/dn/checksum/TestContainerCommandReconciliation.java | 2 +-
5 files changed, 7 insertions(+), 15 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java
index 30daaaf14f3..bd379a8d86e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeySnapshot.java
@@ -60,6 +60,7 @@
import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.hdds.security.symmetric.ManagedSecretKey;
import org.apache.hadoop.hdds.security.symmetric.SecretKeyManager;
+import org.apache.hadoop.hdds.utils.IOUtils;
import org.apache.hadoop.minikdc.MiniKdc;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.MiniOzoneHAClusterImpl;
@@ -133,9 +134,7 @@ public void init() throws Exception {
@AfterEach
public void stop() {
miniKdc.stop();
- if (cluster != null) {
- cluster.stop();
- }
+ IOUtils.closeQuietly(cluster);
}
private void createCredentialsInKDC() throws Exception {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java
index 48950d3c848..59021773bb1 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/TestSecretKeysApi.java
@@ -60,6 +60,7 @@
import org.apache.hadoop.hdds.scm.server.SCMHTTPServerConfig;
import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.hdds.security.symmetric.ManagedSecretKey;
+import org.apache.hadoop.hdds.utils.IOUtils;
import org.apache.hadoop.ipc_.RemoteException;
import org.apache.hadoop.minikdc.MiniKdc;
import org.apache.hadoop.ozone.MiniOzoneCluster;
@@ -113,9 +114,7 @@ public void init() throws Exception {
@AfterEach
public void stop() {
miniKdc.stop();
- if (cluster != null) {
- cluster.stop();
- }
+ IOUtils.closeQuietly(cluster);
}
private void createCredentialsInKDC() throws Exception {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokens.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokens.java
index 90c226f9076..b86ba5df7c4 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokens.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokens.java
@@ -149,10 +149,7 @@ private static void createTestData() throws IOException {
@AfterAll
public static void stop() {
miniKdc.stop();
- IOUtils.close(LOG, client);
- if (cluster != null) {
- cluster.stop();
- }
+ IOUtils.close(LOG, client, cluster);
}
@Test
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokensCLI.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokensCLI.java
index 34a1c0388e0..31c3b36dd46 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokensCLI.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestBlockTokensCLI.java
@@ -116,10 +116,7 @@ public static void init() throws Exception {
@AfterAll
public static void stop() {
miniKdc.stop();
- IOUtils.close(LOG, client);
- if (cluster != null) {
- cluster.stop();
- }
+ IOUtils.close(LOG, client, cluster);
}
private SecretKeyManager getScmSecretKeyManager() {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/checksum/TestContainerCommandReconciliation.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/checksum/TestContainerCommandReconciliation.java
index cbccbc75488..b632b87a90b 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/checksum/TestContainerCommandReconciliation.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/dn/checksum/TestContainerCommandReconciliation.java
@@ -190,7 +190,7 @@ public static void stop() throws IOException {
}
if (cluster != null) {
- cluster.stop();
+ cluster.shutdown();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
