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 30cb5e7 HDDS-6123. Disable system exit in integration tests (#2959)
30cb5e7 is described below
commit 30cb5e7644fc3fcb524ba9ede9059a118b03f2fd
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Jan 4 22:38:24 2022 +0100
HDDS-6123. Disable system exit in integration tests (#2959)
---
.../src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java | 2 ++
.../test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java | 2 ++
.../container/common/transport/server/ratis/TestCSMMetrics.java | 7 +++++++
.../hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java | 2 ++
.../hadoop/ozone/container/server/TestSecureContainerServer.java | 3 +++
5 files changed, 16 insertions(+)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
index 7e11b3c..dc20050 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneCluster.java
@@ -37,6 +37,7 @@ import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.recon.ReconServer;
import
org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.apache.ozone.test.GenericTestUtils;
+import org.apache.ratis.util.ExitUtils;
/**
* Interface used for MiniOzoneClusters.
@@ -341,6 +342,7 @@ public interface MiniOzoneCluster {
protected Builder(OzoneConfiguration conf) {
this.conf = conf;
setClusterId(UUID.randomUUID().toString());
+ ExitUtils.disableSystemExit();
}
public Builder setConf(OzoneConfiguration config) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
index d5cc358..3805103 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java
@@ -111,6 +111,7 @@ import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY;
import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.TOKEN_EXPIRED;
import static
org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod.KERBEROS;
import org.apache.ratis.protocol.ClientId;
+import org.apache.ratis.util.ExitUtils;
import org.bouncycastle.asn1.x500.RDN;
import org.bouncycastle.asn1.x500.X500Name;
import org.bouncycastle.asn1.x500.style.BCStyle;
@@ -186,6 +187,7 @@ public final class TestSecureOzoneCluster {
DefaultMetricsSystem.setMiniClusterMode(true);
+ ExitUtils.disableSystemExit();
final String path = folder.newFolder().toString();
Path metaDirPath = Paths.get(path, "om-meta");
conf.set(OZONE_METADATA_DIRS, metaDirPath.toString());
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
index a4e5310..de3b37b 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/TestCSMMetrics.java
@@ -56,11 +56,13 @@ import static org.apache.ratis.rpc.SupportedRpcType.GRPC;
import static org.junit.Assert.assertTrue;
import org.apache.ratis.protocol.RaftGroupId;
+import org.apache.ratis.util.ExitUtils;
import org.apache.ratis.util.function.CheckedBiConsumer;
import java.util.Map;
import java.util.function.BiConsumer;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.Assert;
@@ -76,6 +78,11 @@ public class TestCSMMetrics {
OUT apply(LEFT left, RIGHT right) throws THROWABLE;
}
+ @BeforeClass
+ public static void setup() {
+ ExitUtils.disableSystemExit();
+ }
+
@Test
public void testContainerStateMachineMetrics() throws Exception {
runContainerStateMachineMetrics(1,
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java
index 5a8b265..c94bfb2 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java
@@ -41,6 +41,7 @@ import
org.apache.hadoop.ozone.container.common.statemachine.StateContext;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
import org.apache.ozone.test.GenericTestUtils;
+import org.apache.ratis.util.ExitUtils;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -114,6 +115,7 @@ public class TestSecureOzoneContainer {
@Before
public void setup() throws Exception {
DefaultMetricsSystem.setMiniClusterMode(true);
+ ExitUtils.disableSystemExit();
conf = new OzoneConfiguration();
String ozoneMetaPath =
GenericTestUtils.getTempPath("ozoneMeta");
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
index f8f2d0a..b15bb67 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
@@ -97,6 +97,8 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.ratis.rpc.RpcType;
import static org.apache.ratis.rpc.SupportedRpcType.GRPC;
+
+import org.apache.ratis.util.ExitUtils;
import org.apache.ratis.util.function.CheckedBiConsumer;
import org.junit.After;
@@ -125,6 +127,7 @@ public class TestSecureContainerServer {
@BeforeClass
public static void setup() throws Exception {
DefaultMetricsSystem.setMiniClusterMode(true);
+ ExitUtils.disableSystemExit();
CONF.set(HddsConfigKeys.HDDS_METADATA_DIR_NAME, TEST_DIR);
CONF.setBoolean(OZONE_SECURITY_ENABLED_KEY, true);
CONF.setBoolean(HDDS_BLOCK_TOKEN_ENABLED, true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
