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 14756bf4aa HDDS-11865. Remove tests for non-Ratis OM (#7535)
14756bf4aa is described below
commit 14756bf4aaa9fe9c25feb71dd03b660f6361509f
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Jan 1 09:22:28 2025 +0100
HDDS-11865. Remove tests for non-Ratis OM (#7535)
---
.../fs/ozone/AbstractOzoneFileSystemTest.java | 5 +-
.../ozone/AbstractOzoneFileSystemTestWithFSO.java | 4 +-
.../ozone/AbstractRootedOzoneFileSystemTest.java | 7 +-
.../AbstractRootedOzoneFileSystemTestWithFSO.java | 2 +-
.../ozone/TestDirectoryDeletingServiceWithFSO.java | 3 -
.../java/org/apache/hadoop/fs/ozone/TestHSync.java | 2 -
.../apache/hadoop/fs/ozone/TestHSyncUpgrade.java | 2 -
.../apache/hadoop/fs/ozone/TestLeaseRecovery.java | 2 -
.../java/org/apache/hadoop/fs/ozone/TestO3FS.java | 2 +-
.../apache/hadoop/fs/ozone/TestO3FSWithFSO.java | 2 +-
.../hadoop/fs/ozone/TestO3FSWithFSOAndOMRatis.java | 27 ---
.../hadoop/fs/ozone/TestO3FSWithFSPaths.java | 2 +-
.../fs/ozone/TestO3FSWithFSPathsAndOMRatis.java | 28 ---
.../hadoop/fs/ozone/TestO3FSWithOMRatis.java | 28 ---
.../java/org/apache/hadoop/fs/ozone/TestOFS.java | 2 +-
.../hadoop/fs/ozone/TestOFSWithCacheOnly.java | 2 +-
.../hadoop/fs/ozone/TestOFSWithFSOAndOMRatis.java | 27 ---
.../TestOFSWithFSOAndOMRatisAndCacheOnly.java | 27 ---
.../apache/hadoop/fs/ozone/TestOFSWithFSPaths.java | 2 +-
.../fs/ozone/TestOFSWithFSPathsAndOMRatis.java | 28 ---
.../ozone/TestOFSWithFSPathsAndOMRatisAndACL.java | 28 ---
.../TestOFSWithFSPathsAndOMRatisAndCacheOnly.java | 28 ---
.../apache/hadoop/fs/ozone/TestOFSWithOMRatis.java | 28 ---
.../fs/ozone/TestOzoneFileSystemWithStreaming.java | 2 -
.../hadoop/fs/ozone/TestRootedDDSWithFSO.java | 1 -
.../hadoop/ozone/MiniOzoneHAClusterImpl.java | 2 -
.../ozone/client/rpc/TestOzoneRpcClient.java | 4 +-
.../client/rpc/TestOzoneRpcClientWithRatis.java | 55 ------
.../org/apache/hadoop/ozone/om/TestKeyPurging.java | 2 -
.../hadoop/ozone/om/TestOMDbCheckpointServlet.java | 8 -
.../hadoop/ozone/om/TestOMEpochForNonRatis.java | 215 ---------------------
.../ozone/om/TestOzoneManagerConfiguration.java | 1 -
.../snapshot/TestOzoneManagerSnapshotProvider.java | 1 -
...TestSnapshotDeletingServiceIntegrationTest.java | 2 -
.../TestReconInsightsForDeletedDirectories.java | 4 -
.../ozone/recon/TestReconWithOzoneManagerHA.java | 2 -
.../hadoop/ozone/s3/awssdk/v1/TestS3SDKV1.java | 4 +-
.../ozone/s3/awssdk/v1/TestS3SDKV1WithRatis.java | 49 -----
.../awssdk/v1/TestS3SDKV1WithRatisStreaming.java | 2 -
39 files changed, 14 insertions(+), 628 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java
index 9730647518..caba8b3519 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTest.java
@@ -150,9 +150,8 @@ abstract class AbstractOzoneFileSystemTest {
p -> !p.toUri().getPath().startsWith(TRASH_ROOT.toString());
private String fsRoot;
- AbstractOzoneFileSystemTest(boolean setDefaultFs, boolean enableOMRatis,
BucketLayout layout) {
+ AbstractOzoneFileSystemTest(boolean setDefaultFs, BucketLayout layout) {
enabledFileSystemPaths = setDefaultFs;
- omRatisEnabled = enableOMRatis;
bucketLayout = layout;
}
@@ -161,7 +160,6 @@ abstract class AbstractOzoneFileSystemTest {
private final BucketLayout bucketLayout;
private final boolean enabledFileSystemPaths;
- private final boolean omRatisEnabled;
private MiniOzoneCluster cluster;
private OzoneClient client;
@@ -186,7 +184,6 @@ abstract class AbstractOzoneFileSystemTest {
conf.setFloat(FS_TRASH_INTERVAL_KEY, TRASH_INTERVAL);
conf.setFloat(FS_TRASH_CHECKPOINT_INTERVAL_KEY, TRASH_INTERVAL / 2);
conf.setInt(OZONE_OM_SERVER_LIST_MAX_SIZE, 2);
- conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, omRatisEnabled);
conf.setBoolean(OZONE_ACL_ENABLED, true);
conf.setBoolean(OzoneConfigKeys.OZONE_HBASE_ENHANCEMENTS_ALLOWED, true);
conf.setBoolean("ozone.client.hbase.enhancements.allowed", true);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTestWithFSO.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTestWithFSO.java
index 49afba7b38..668c9c85da 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTestWithFSO.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractOzoneFileSystemTestWithFSO.java
@@ -65,8 +65,8 @@ abstract class AbstractOzoneFileSystemTestWithFSO extends
AbstractOzoneFileSyste
private static final Logger LOG =
LoggerFactory.getLogger(AbstractOzoneFileSystemTestWithFSO.class);
- AbstractOzoneFileSystemTestWithFSO(boolean enableOMRatis) {
- super(true, enableOMRatis, BucketLayout.FILE_SYSTEM_OPTIMIZED);
+ AbstractOzoneFileSystemTestWithFSO() {
+ super(true, BucketLayout.FILE_SYSTEM_OPTIMIZED);
}
@Test
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTest.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTest.java
index 2251b10581..a3b5982454 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTest.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTest.java
@@ -157,11 +157,10 @@ abstract class AbstractRootedOzoneFileSystemTest {
private OzoneClient client;
AbstractRootedOzoneFileSystemTest(BucketLayout bucketLayout, boolean
setDefaultFs,
- boolean enableOMRatis, boolean isAclEnabled, boolean noFlush) {
+ boolean isAclEnabled, boolean noFlush) {
// Initialize the cluster before EACH set of parameters
this.bucketLayout = bucketLayout;
enabledFileSystemPaths = setDefaultFs;
- omRatisEnabled = enableOMRatis;
enableAcl = isAclEnabled;
useOnlyCache = noFlush;
isBucketFSOptimized = bucketLayout.isFileSystemOptimized();
@@ -202,7 +201,6 @@ abstract class AbstractRootedOzoneFileSystemTest {
}
private final boolean enabledFileSystemPaths;
- private final boolean omRatisEnabled;
private final boolean isBucketFSOptimized;
private final boolean enableAcl;
@@ -236,7 +234,6 @@ abstract class AbstractRootedOzoneFileSystemTest {
conf.setFloat(OMConfigKeys.OZONE_FS_TRASH_INTERVAL_KEY, TRASH_INTERVAL);
conf.setFloat(FS_TRASH_INTERVAL_KEY, TRASH_INTERVAL);
conf.setFloat(FS_TRASH_CHECKPOINT_INTERVAL_KEY, TRASH_INTERVAL / 2);
- conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, omRatisEnabled);
conf.setBoolean(OzoneConfigKeys.OZONE_HBASE_ENHANCEMENTS_ALLOWED, true);
conf.setBoolean("ozone.client.hbase.enhancements.allowed", true);
conf.setBoolean(OzoneConfigKeys.OZONE_FS_HSYNC_ENABLED, true);
@@ -284,7 +281,7 @@ abstract class AbstractRootedOzoneFileSystemTest {
-> (RootedOzoneFileSystem) FileSystem.get(conf));
if (useOnlyCache) {
-
cluster.getOzoneManager().getOmServerProtocol().setShouldFlushCache(omRatisEnabled);
+
cluster.getOzoneManager().getOmServerProtocol().setShouldFlushCache(true);
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTestWithFSO.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTestWithFSO.java
index 9389a4fdbd..40ef0bff7e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTestWithFSO.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/AbstractRootedOzoneFileSystemTestWithFSO.java
@@ -48,7 +48,7 @@ abstract class AbstractRootedOzoneFileSystemTestWithFSO
extends AbstractRootedOz
LoggerFactory.getLogger(AbstractRootedOzoneFileSystemTestWithFSO.class);
AbstractRootedOzoneFileSystemTestWithFSO(boolean enableOMRatis, boolean
isAclEnabled, boolean noFlush) {
- super(BucketLayout.FILE_SYSTEM_OPTIMIZED, true, enableOMRatis,
isAclEnabled, noFlush);
+ super(BucketLayout.FILE_SYSTEM_OPTIMIZED, true, isAclEnabled, noFlush);
}
/**
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
index 78fb4c66fc..049db78cf6 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
@@ -104,8 +104,6 @@ public class TestDirectoryDeletingServiceWithFSO {
private static final Logger LOG =
LoggerFactory.getLogger(TestDirectoryDeletingServiceWithFSO.class);
- private static boolean omRatisEnabled = true;
-
private static MiniOzoneCluster cluster;
private static FileSystem fs;
private static String volumeName;
@@ -120,7 +118,6 @@ public class TestDirectoryDeletingServiceWithFSO {
conf.setTimeDuration(OZONE_BLOCK_DELETING_SERVICE_INTERVAL, 100,
TimeUnit.MILLISECONDS);
conf.setTimeDuration(OZONE_SNAPSHOT_DELETING_SERVICE_INTERVAL, 1000,
TimeUnit.MILLISECONDS);
- conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, omRatisEnabled);
conf.setBoolean(OZONE_ACL_ENABLED, true);
cluster = MiniOzoneCluster.newBuilder(conf)
.setNumDatanodes(3)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSync.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSync.java
index d00b86d937..efd5f2765e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSync.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSync.java
@@ -134,7 +134,6 @@ import static
org.apache.hadoop.ozone.TestDataUtil.cleanupDeletedTable;
import static org.apache.hadoop.ozone.TestDataUtil.cleanupOpenKeyTable;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY;
-import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_DIR_DELETING_SERVICE_INTERVAL;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_OPEN_KEY_CLEANUP_SERVICE_INTERVAL;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_OPEN_KEY_EXPIRE_THRESHOLD;
@@ -181,7 +180,6 @@ public class TestHSync {
public static void init() throws Exception {
final BucketLayout layout = BUCKET_LAYOUT;
- CONF.setBoolean(OZONE_OM_RATIS_ENABLE_KEY, true);
CONF.set(OZONE_DEFAULT_BUCKET_LAYOUT, layout.name());
CONF.setBoolean(OzoneConfigKeys.OZONE_HBASE_ENHANCEMENTS_ALLOWED, true);
CONF.setBoolean("ozone.client.hbase.enhancements.allowed", true);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSyncUpgrade.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSyncUpgrade.java
index 624b5e02c1..abf32b39ab 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSyncUpgrade.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestHSyncUpgrade.java
@@ -69,7 +69,6 @@ import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_LEASE_HARD_LIMIT;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_OPEN_KEY_CLEANUP_SERVICE_INTERVAL;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_OPEN_KEY_EXPIRE_THRESHOLD;
-import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY;
import static
org.apache.hadoop.ozone.om.OmUpgradeConfig.ConfigStrings.OZONE_OM_INIT_DEFAULT_LAYOUT_VERSION;
import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.NOT_SUPPORTED_OPERATION_PRIOR_FINALIZATION;
import static org.apache.ozone.test.LambdaTestUtils.await;
@@ -105,7 +104,6 @@ public class TestHSyncUpgrade {
public void init() throws Exception {
final BucketLayout layout = BUCKET_LAYOUT;
- conf.setBoolean(OZONE_OM_RATIS_ENABLE_KEY, false);
conf.set(OZONE_DEFAULT_BUCKET_LAYOUT, layout.name());
conf.setBoolean(OzoneConfigKeys.OZONE_HBASE_ENHANCEMENTS_ALLOWED, true);
conf.setBoolean("ozone.client.hbase.enhancements.allowed", true);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestLeaseRecovery.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestLeaseRecovery.java
index 6a3a0eb5b6..d488530033 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestLeaseRecovery.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestLeaseRecovery.java
@@ -72,7 +72,6 @@ import static org.apache.hadoop.ozone.OzoneConsts.OZONE_ROOT;
import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_DELIMITER;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY;
-import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -119,7 +118,6 @@ public class TestLeaseRecovery {
final int blockSize = 2 * maxFlushSize;
final BucketLayout layout = BucketLayout.FILE_SYSTEM_OPTIMIZED;
- conf.setBoolean(OZONE_OM_RATIS_ENABLE_KEY, false);
conf.setBoolean(OzoneConfigKeys.OZONE_HBASE_ENHANCEMENTS_ALLOWED, true);
conf.setBoolean("ozone.client.hbase.enhancements.allowed", true);
conf.setBoolean(OzoneConfigKeys.OZONE_FS_HSYNC_ENABLED, true);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FS.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FS.java
index 5fdab6fe95..9692c20bbc 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FS.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FS.java
@@ -23,6 +23,6 @@ import org.junit.jupiter.api.TestInstance;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class TestO3FS extends AbstractOzoneFileSystemTest {
TestO3FS() {
- super(false, false, BucketLayout.LEGACY);
+ super(false, BucketLayout.LEGACY);
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithFSO.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithFSO.java
index 0d6be62b4f..2799dfcfea 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithFSO.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithFSO.java
@@ -22,6 +22,6 @@ import org.junit.jupiter.api.TestInstance;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class TestO3FSWithFSO extends AbstractOzoneFileSystemTestWithFSO {
TestO3FSWithFSO() {
- super(false);
+ super();
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithFSOAndOMRatis.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithFSOAndOMRatis.java
deleted file mode 100644
index d616d08e32..0000000000
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithFSOAndOMRatis.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.fs.ozone;
-
-import org.junit.jupiter.api.TestInstance;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class TestO3FSWithFSOAndOMRatis extends AbstractOzoneFileSystemTestWithFSO {
- TestO3FSWithFSOAndOMRatis() {
- super(true);
- }
-}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithFSPaths.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithFSPaths.java
index 5fffd9df7f..a603d7a847 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithFSPaths.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithFSPaths.java
@@ -23,6 +23,6 @@ import org.junit.jupiter.api.TestInstance;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class TestO3FSWithFSPaths extends AbstractOzoneFileSystemTest {
TestO3FSWithFSPaths() {
- super(true, false, BucketLayout.LEGACY);
+ super(true, BucketLayout.LEGACY);
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithFSPathsAndOMRatis.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithFSPathsAndOMRatis.java
deleted file mode 100644
index 461961c3e7..0000000000
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithFSPathsAndOMRatis.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.fs.ozone;
-
-import org.apache.hadoop.ozone.om.helpers.BucketLayout;
-import org.junit.jupiter.api.TestInstance;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class TestO3FSWithFSPathsAndOMRatis extends AbstractOzoneFileSystemTest {
- TestO3FSWithFSPathsAndOMRatis() {
- super(true, true, BucketLayout.LEGACY);
- }
-}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithOMRatis.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithOMRatis.java
deleted file mode 100644
index a02f3812e0..0000000000
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestO3FSWithOMRatis.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.fs.ozone;
-
-import org.apache.hadoop.ozone.om.helpers.BucketLayout;
-import org.junit.jupiter.api.TestInstance;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class TestO3FSWithOMRatis extends AbstractOzoneFileSystemTest {
- TestO3FSWithOMRatis() {
- super(false, true, BucketLayout.LEGACY);
- }
-}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFS.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFS.java
index 295c182f7d..e9f734a426 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFS.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFS.java
@@ -23,6 +23,6 @@ import org.junit.jupiter.api.TestInstance;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class TestOFS extends AbstractRootedOzoneFileSystemTest {
TestOFS() {
- super(BucketLayout.LEGACY, false, false, false, false);
+ super(BucketLayout.LEGACY, false, false, false);
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithCacheOnly.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithCacheOnly.java
index 0ce2a80e88..58b1f97a8d 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithCacheOnly.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithCacheOnly.java
@@ -23,6 +23,6 @@ import org.junit.jupiter.api.TestInstance;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class TestOFSWithCacheOnly extends AbstractRootedOzoneFileSystemTest {
TestOFSWithCacheOnly() {
- super(BucketLayout.LEGACY, false, false, false, true);
+ super(BucketLayout.LEGACY, false, false, true);
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSOAndOMRatis.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSOAndOMRatis.java
deleted file mode 100644
index c6e837becd..0000000000
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSOAndOMRatis.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.fs.ozone;
-
-import org.junit.jupiter.api.TestInstance;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class TestOFSWithFSOAndOMRatis extends
AbstractRootedOzoneFileSystemTestWithFSO {
- TestOFSWithFSOAndOMRatis() {
- super(true, false, false);
- }
-}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSOAndOMRatisAndCacheOnly.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSOAndOMRatisAndCacheOnly.java
deleted file mode 100644
index 2bd14d9c36..0000000000
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSOAndOMRatisAndCacheOnly.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.fs.ozone;
-
-import org.junit.jupiter.api.TestInstance;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class TestOFSWithFSOAndOMRatisAndCacheOnly extends
AbstractRootedOzoneFileSystemTestWithFSO {
- TestOFSWithFSOAndOMRatisAndCacheOnly() {
- super(true, false, true);
- }
-}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSPaths.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSPaths.java
index 9e06c2d5b5..75c0946723 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSPaths.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSPaths.java
@@ -23,6 +23,6 @@ import org.junit.jupiter.api.TestInstance;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class TestOFSWithFSPaths extends AbstractRootedOzoneFileSystemTest {
TestOFSWithFSPaths() {
- super(BucketLayout.LEGACY, true, false, false, false);
+ super(BucketLayout.LEGACY, true, false, false);
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSPathsAndOMRatis.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSPathsAndOMRatis.java
deleted file mode 100644
index 592d11df24..0000000000
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSPathsAndOMRatis.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.fs.ozone;
-
-import org.apache.hadoop.ozone.om.helpers.BucketLayout;
-import org.junit.jupiter.api.TestInstance;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class TestOFSWithFSPathsAndOMRatis extends AbstractRootedOzoneFileSystemTest {
- TestOFSWithFSPathsAndOMRatis() {
- super(BucketLayout.LEGACY, true, true, false, false);
- }
-}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSPathsAndOMRatisAndACL.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSPathsAndOMRatisAndACL.java
deleted file mode 100644
index 975bf47425..0000000000
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSPathsAndOMRatisAndACL.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.fs.ozone;
-
-import org.apache.hadoop.ozone.om.helpers.BucketLayout;
-import org.junit.jupiter.api.TestInstance;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class TestOFSWithFSPathsAndOMRatisAndACL extends
AbstractRootedOzoneFileSystemTest {
- TestOFSWithFSPathsAndOMRatisAndACL() {
- super(BucketLayout.LEGACY, true, true, true, false);
- }
-}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSPathsAndOMRatisAndCacheOnly.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSPathsAndOMRatisAndCacheOnly.java
deleted file mode 100644
index 212586d9af..0000000000
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithFSPathsAndOMRatisAndCacheOnly.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.fs.ozone;
-
-import org.apache.hadoop.ozone.om.helpers.BucketLayout;
-import org.junit.jupiter.api.TestInstance;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class TestOFSWithFSPathsAndOMRatisAndCacheOnly extends
AbstractRootedOzoneFileSystemTest {
- TestOFSWithFSPathsAndOMRatisAndCacheOnly() {
- super(BucketLayout.LEGACY, true, true, false, true);
- }
-}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithOMRatis.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithOMRatis.java
deleted file mode 100644
index 84a4ac5aaa..0000000000
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOFSWithOMRatis.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.fs.ozone;
-
-import org.apache.hadoop.ozone.om.helpers.BucketLayout;
-import org.junit.jupiter.api.TestInstance;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class TestOFSWithOMRatis extends AbstractRootedOzoneFileSystemTest {
- TestOFSWithOMRatis() {
- super(BucketLayout.LEGACY, false, true, false, false);
- }
-}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithStreaming.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithStreaming.java
index 059f7b3e03..5f8bf162b4 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithStreaming.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFileSystemWithStreaming.java
@@ -54,7 +54,6 @@ import static
org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_DELIMITER;
import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_SCHEME;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT;
import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ADDRESS_KEY;
-import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -86,7 +85,6 @@ public class TestOzoneFileSystemWithStreaming {
CONF.setBoolean(HDDS_CONTAINER_RATIS_DATASTREAM_ENABLED, true);
CONF.setBoolean(OZONE_FS_DATASTREAM_ENABLED, true);
CONF.set(OZONE_FS_DATASTREAM_AUTO_THRESHOLD, AUTO_THRESHOLD + "B");
- CONF.setBoolean(OZONE_OM_RATIS_ENABLE_KEY, true);
CONF.set(OZONE_DEFAULT_BUCKET_LAYOUT, layout.name());
CONF.setInt(OZONE_SCM_RATIS_PIPELINE_LIMIT, 10);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedDDSWithFSO.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedDDSWithFSO.java
index de3358685e..4a3bd85aa3 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedDDSWithFSO.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestRootedDDSWithFSO.java
@@ -88,7 +88,6 @@ public class TestRootedDDSWithFSO {
conf.setInt(OMConfigKeys.OZONE_PATH_DELETING_LIMIT_PER_TASK, 5);
conf.setTimeDuration(OZONE_BLOCK_DELETING_SERVICE_INTERVAL, 100,
TimeUnit.MILLISECONDS);
- conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, true);
conf.setBoolean(OZONE_ACL_ENABLED, true);
conf.set(OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT,
BucketLayout.FILE_SYSTEM_OPTIMIZED.name());
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
index 39c2250b73..9df70f1b7c 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
@@ -446,8 +446,6 @@ public class MiniOzoneHAClusterImpl extends
MiniOzoneClusterImpl {
}
protected void initOMRatisConf() {
- conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, true);
-
// If test change the following config values we will respect,
// otherwise we will set lower timeout values.
long defaultDuration =
OMConfigKeys.OZONE_OM_RATIS_MINIMUM_TIMEOUT_DEFAULT
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java
index 0c5db29fd5..7a3e66a0ad 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClient.java
@@ -23,14 +23,13 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.ozone.OzoneConfigKeys;
-import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Timeout;
/**
- * Test Ozone Client with OM Ratis disabled.
+ * Test Ozone Client with OM Ratis enabled.
*/
@Timeout(300)
class TestOzoneRpcClient extends OzoneRpcClientTests {
@@ -38,7 +37,6 @@ class TestOzoneRpcClient extends OzoneRpcClientTests {
@BeforeAll
public static void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
- conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, false);
conf.setInt(ScmConfigKeys.OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT, 1);
conf.setBoolean(OzoneConfigKeys.OZONE_ACL_ENABLED, true);
conf.set(OzoneConfigKeys.OZONE_ACL_AUTHORIZER_CLASS,
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithRatis.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithRatis.java
deleted file mode 100644
index 95d7ba6218..0000000000
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientWithRatis.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.ozone.client.rpc;
-
-import java.io.IOException;
-
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.hdds.scm.ScmConfigKeys;
-import org.apache.hadoop.ozone.OzoneConfigKeys;
-import org.apache.hadoop.ozone.om.OMConfigKeys;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-
-/**
- * Test Ozone Client with OM Ratis enabled.
- */
-class TestOzoneRpcClientWithRatis extends OzoneRpcClientTests {
-
- @BeforeAll
- public static void init() throws Exception {
- OzoneConfiguration conf = new OzoneConfiguration();
- conf.setInt(ScmConfigKeys.OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT, 1);
- conf.setBoolean(ScmConfigKeys.OZONE_SCM_PIPELINE_AUTO_CREATE_FACTOR_ONE,
- false);
- conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, true);
- conf.setBoolean(OzoneConfigKeys.OZONE_NETWORK_TOPOLOGY_AWARE_READ_KEY,
- true);
- conf.setBoolean(OzoneConfigKeys.OZONE_ACL_ENABLED, true);
- conf.set(OzoneConfigKeys.OZONE_ACL_AUTHORIZER_CLASS,
- OzoneConfigKeys.OZONE_ACL_AUTHORIZER_CLASS_NATIVE);
- startCluster(conf);
- }
-
- @AfterAll
- public static void shutdown() throws IOException {
- shutdownCluster();
- }
-
-}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java
index e3bb5b5bcc..23d0cdd1b1 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestKeyPurging.java
@@ -73,8 +73,6 @@ public class TestKeyPurging {
TimeUnit.MILLISECONDS);
conf.setTimeDuration(HDDS_CONTAINER_REPORT_INTERVAL, 200,
TimeUnit.MILLISECONDS);
- // TODO enable when RATIS-788 is fixed
- conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, false);
conf.setQuietMode(false);
cluster = MiniOzoneCluster.newBuilder(conf)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java
index f0f4744e8c..a94f6ea017 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMDbCheckpointServlet.java
@@ -96,7 +96,6 @@ import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
-import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY;
import static org.apache.hadoop.ozone.om.OmSnapshotManager.OM_HARDLINK_FILE;
import static org.apache.hadoop.ozone.om.snapshot.OmSnapshotUtils.DATA_PREFIX;
import static org.apache.hadoop.ozone.om.snapshot.OmSnapshotUtils.DATA_SUFFIX;
@@ -293,13 +292,6 @@ public class TestOMDbCheckpointServlet {
any(), any(), eq(toExcludeList), any(), any());
}
- @ParameterizedTest
- @MethodSource("getHttpMethods")
- public void testEndpointNotRatis(String httpMethod) throws Exception {
- conf.setBoolean(OZONE_OM_RATIS_ENABLE_KEY, false);
- testEndpoint(httpMethod);
- }
-
@Test
public void testDoPostWithInvalidContentType() throws Exception {
conf.setBoolean(OZONE_ACL_ENABLED, false);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMEpochForNonRatis.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMEpochForNonRatis.java
deleted file mode 100644
index 01ba4db399..0000000000
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOMEpochForNonRatis.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.ozone.om;
-
-import java.util.HashMap;
-
-import org.apache.hadoop.hdds.utils.IOUtils;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.hadoop.hdds.client.ReplicationFactor;
-import org.apache.hadoop.hdds.client.ReplicationType;
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.hdds.utils.TransactionInfo;
-import org.apache.hadoop.hdds.utils.db.Table;
-import org.apache.hadoop.ozone.MiniOzoneCluster;
-import org.apache.hadoop.ozone.OmUtils;
-import org.apache.hadoop.ozone.client.ObjectStore;
-import org.apache.hadoop.ozone.client.OzoneClient;
-import org.apache.hadoop.ozone.client.OzoneVolume;
-import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
-import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
-import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
-import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
-import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
-import org.apache.hadoop.ozone.om.protocolPB.OmTransportFactory;
-import
org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolClientSideTranslatorPB;
-import org.apache.hadoop.security.UserGroupInformation;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-
-import static org.apache.hadoop.ozone.OzoneConsts.TRANSACTION_INFO_KEY;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.hadoop.ozone.OmUtils.EPOCH_ID_SHIFT;
-import static org.apache.hadoop.ozone.OmUtils.EPOCH_WHEN_RATIS_NOT_ENABLED;
-import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-/**
- * Tests OM epoch generation for when Ratis is not enabled.
- */
-@Timeout(240)
-public class TestOMEpochForNonRatis {
- private static MiniOzoneCluster cluster = null;
- private static OzoneConfiguration conf;
- private static OzoneClient client;
-
- @BeforeAll
- public static void init() throws Exception {
- conf = new OzoneConfiguration();
- conf.setBoolean(OZONE_OM_RATIS_ENABLE_KEY, false);
- cluster = MiniOzoneCluster.newBuilder(conf)
- .build();
- cluster.waitForClusterToBeReady();
- client = cluster.newClient();
- }
-
- /**
- * Shutdown MiniDFSCluster.
- */
- @AfterAll
- public static void shutdown() {
- IOUtils.closeQuietly(client);
- if (cluster != null) {
- cluster.shutdown();
- }
- }
-
- @Test
- public void testUniqueTrxnIndexOnOMRestart() throws Exception {
- // When OM is restarted, the transaction index for requests should not
- // start from 0. It should incrementally increase from the last
- // transaction index which was stored in DB before restart.
-
- String volumeName = "volume" + RandomStringUtils.randomNumeric(5);
- String bucketName = "bucket" + RandomStringUtils.randomNumeric(5);
- String keyName = "key" + RandomStringUtils.randomNumeric(5);
-
- OzoneManager om = cluster.getOzoneManager();
- ObjectStore objectStore = client.getObjectStore();
-
- UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
- OzoneManagerProtocolClientSideTranslatorPB omClient =
- new OzoneManagerProtocolClientSideTranslatorPB(
- OmTransportFactory.create(conf, ugi, null),
- RandomStringUtils.randomAscii(5));
-
- objectStore.createVolume(volumeName);
-
- // Verify that the last transactionIndex stored in DB after volume
- // creation equals the transaction index corresponding to volume's
- // objectID. Also, the volume transaction index should be 1 as this is
- // the first transaction in this cluster.
- OmVolumeArgs volumeInfo = omClient.getVolumeInfo(volumeName);
- long volumeTrxnIndex = OmUtils.getTxIdFromObjectId(
- volumeInfo.getObjectID());
- assertEquals(1, volumeTrxnIndex);
- assertEquals(volumeTrxnIndex, om.getLastTrxnIndexForNonRatis());
-
- OzoneVolume ozoneVolume = objectStore.getVolume(volumeName);
- ozoneVolume.createBucket(bucketName);
-
- // Verify last transactionIndex is updated after bucket creation
- OmBucketInfo bucketInfo = omClient.getBucketInfo(volumeName, bucketName);
- long bucketTrxnIndex = OmUtils.getTxIdFromObjectId(
- bucketInfo.getObjectID());
- assertEquals(2, bucketTrxnIndex);
- assertEquals(bucketTrxnIndex, om.getLastTrxnIndexForNonRatis());
-
- // Restart the OM and create new object
- cluster.restartOzoneManager();
-
- String data = "random data";
- OzoneOutputStream ozoneOutputStream = ozoneVolume.getBucket(bucketName)
- .createKey(keyName, data.length(), ReplicationType.RATIS,
- ReplicationFactor.ONE, new HashMap<>());
- ozoneOutputStream.write(data.getBytes(UTF_8), 0, data.length());
- ozoneOutputStream.close();
-
- // Verify last transactionIndex is updated after key creation and the
- // transaction index after restart is incremented from the last
- // transaction index before restart.
- OmKeyInfo omKeyInfo = omClient.lookupKey(new OmKeyArgs.Builder()
- .setVolumeName(volumeName)
- .setBucketName(bucketName)
- .setKeyName(keyName)
- .build());
- long keyTrxnIndex = OmUtils.getTxIdFromObjectId(
- omKeyInfo.getObjectID());
- assertEquals(3, keyTrxnIndex);
- // Key commit is a separate transaction. Hence, the last trxn index in DB
- // should be 1 more than KeyTrxnIndex
- assertEquals(4, om.getLastTrxnIndexForNonRatis());
- }
-
- @Test
- public void testIncreaseTrxnIndexBasedOnExistingDB() throws Exception {
- // Set transactionInfo.getTerm() not -1 to mock the DB migrated from ratis
cluster.
- // When OM is first started from the existing ratis DB, the transaction
index for
- // requests should not start from 0. It should incrementally increase from
the last
- // transaction index which was stored in DB transactionInfoTable before
started.
-
- String volumeName = "volume" + RandomStringUtils.randomNumeric(5);
- String bucketName = "bucket" + RandomStringUtils.randomNumeric(5);
- String keyName = "key" + RandomStringUtils.randomNumeric(5);
-
- OzoneManager om = cluster.getOzoneManager();
- ObjectStore objectStore = client.getObjectStore();
-
- objectStore.createVolume(volumeName);
- OzoneVolume ozoneVolume = objectStore.getVolume(volumeName);
- ozoneVolume.createBucket(bucketName);
-
- Table<String, TransactionInfo> transactionInfoTable =
om.getMetadataManager().getTransactionInfoTable();
- long initIndex =
transactionInfoTable.get(TRANSACTION_INFO_KEY).getTransactionIndex();
- // Set transactionInfo.getTerm() = 1 to mock the DB migrated from ratis
cluster
- transactionInfoTable.put(TRANSACTION_INFO_KEY, TransactionInfo.valueOf(1,
initIndex));
- TransactionInfo transactionInfo =
transactionInfoTable.get(TRANSACTION_INFO_KEY);
- // Verify transaction term != -1 and index > 1
- assertEquals(1, transactionInfo.getTerm());
- assertTrue(initIndex > 1);
-
- // Restart the OM and create new object
- cluster.restartOzoneManager();
-
- String data = "random data";
- OzoneOutputStream ozoneOutputStream =
ozoneVolume.getBucket(bucketName).createKey(keyName, data.length());
- ozoneOutputStream.write(data.getBytes(UTF_8), 0, data.length());
- ozoneOutputStream.close();
-
- // Transaction index after OM restart is incremented by 2 (create and
commit op) from the last
- // transaction index before OM restart rather than from 0.
- // So, the transactionIndex should be (initIndex + 2) rather than (0 + 2)
- assertEquals(initIndex + 2,
-
om.getMetadataManager().getTransactionInfoTable().get(TRANSACTION_INFO_KEY).getTransactionIndex());
- }
-
- @Test
- public void testEpochIntegrationInObjectID() throws Exception {
- // Create a volume and check the objectID has the epoch as
- // EPOCH_FOR_RATIS_NOT_ENABLED in the first 2 bits.
-
- ObjectStore objectStore = client.getObjectStore();
-
- String volumeName = "volume" + RandomStringUtils.randomNumeric(5);
- objectStore.createVolume(volumeName);
-
- UserGroupInformation ugi = UserGroupInformation.getCurrentUser();
- OzoneManagerProtocolClientSideTranslatorPB omClient =
- new OzoneManagerProtocolClientSideTranslatorPB(
- OmTransportFactory.create(conf, ugi, null),
- RandomStringUtils.randomAscii(5));
-
- long volObjId = omClient.getVolumeInfo(volumeName).getObjectID();
- long epochInVolObjId = volObjId >> EPOCH_ID_SHIFT;
-
- assertEquals(EPOCH_WHEN_RATIS_NOT_ENABLED, epochInVolObjId);
- }
-}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
index 81f87265b0..ab67eb7ba3 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerConfiguration.java
@@ -67,7 +67,6 @@ public class TestOzoneManagerConfiguration {
void init(@TempDir Path metaDirPath) throws IOException {
conf = new OzoneConfiguration();
conf.set(HddsConfigKeys.OZONE_METADATA_DIRS, metaDirPath.toString());
- conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, true);
conf.setTimeDuration(OMConfigKeys.OZONE_OM_RATIS_MINIMUM_TIMEOUT_KEY,
RATIS_RPC_TIMEOUT, TimeUnit.MILLISECONDS);
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java
index d28f25a28f..29417a075c 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerSnapshotProvider.java
@@ -65,7 +65,6 @@ public class TestOzoneManagerSnapshotProvider {
conf = new OzoneConfiguration();
omServiceId = "om-service-test1";
conf.setBoolean(OMConfigKeys.OZONE_OM_HTTP_ENABLED_KEY, true);
- conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, true);
cluster = MiniOzoneCluster.newHABuilder(conf)
.setOMServiceId(omServiceId)
.setNumOfOzoneManagers(numOfOMs)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDeletingServiceIntegrationTest.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDeletingServiceIntegrationTest.java
index c3a58a1a21..9bafe148ae 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDeletingServiceIntegrationTest.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDeletingServiceIntegrationTest.java
@@ -107,7 +107,6 @@ public class TestSnapshotDeletingServiceIntegrationTest {
private static final Logger LOG =
LoggerFactory.getLogger(TestSnapshotDeletingServiceIntegrationTest.class);
- private static boolean omRatisEnabled = true;
private static final ByteBuffer CONTENT =
ByteBuffer.allocate(1024 * 1024 * 16);
@@ -138,7 +137,6 @@ public class TestSnapshotDeletingServiceIntegrationTest {
conf.setInt(OMConfigKeys.OZONE_PATH_DELETING_LIMIT_PER_TASK, 5);
conf.setTimeDuration(OZONE_BLOCK_DELETING_SERVICE_INTERVAL, 500,
TimeUnit.MILLISECONDS);
- conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, omRatisEnabled);
conf.setBoolean(OZONE_ACL_ENABLED, true);
// Enable filesystem snapshot feature for the test regardless of the
default
conf.setBoolean(OMConfigKeys.OZONE_FILESYSTEM_SNAPSHOT_ENABLED_KEY, true);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconInsightsForDeletedDirectories.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconInsightsForDeletedDirectories.java
index 8656682cd1..80f06b2ef5 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconInsightsForDeletedDirectories.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconInsightsForDeletedDirectories.java
@@ -61,7 +61,6 @@ import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVI
import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_ITERATE_BATCH_SIZE;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_DIR_DELETING_SERVICE_INTERVAL;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_PATH_DELETING_LIMIT_PER_TASK;
-import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -77,8 +76,6 @@ public class TestReconInsightsForDeletedDirectories {
private static final Logger LOG =
LoggerFactory.getLogger(TestReconInsightsForDeletedDirectories.class);
- private static boolean omRatisEnabled = true;
-
private static MiniOzoneCluster cluster;
private static FileSystem fs;
private static String volumeName;
@@ -92,7 +89,6 @@ public class TestReconInsightsForDeletedDirectories {
conf.setInt(OZONE_PATH_DELETING_LIMIT_PER_TASK, 0);
conf.setTimeDuration(OZONE_BLOCK_DELETING_SERVICE_INTERVAL, 10000000,
TimeUnit.MILLISECONDS);
- conf.setBoolean(OZONE_OM_RATIS_ENABLE_KEY, omRatisEnabled);
conf.setBoolean(OZONE_ACL_ENABLED, true);
cluster = MiniOzoneCluster.newBuilder(conf)
.setNumDatanodes(3)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java
index 0d7cb5fbf0..955b5cd73e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java
@@ -31,7 +31,6 @@ import org.apache.hadoop.ozone.client.ObjectStore;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneClientFactory;
import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
-import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.recon.api.types.ContainerKeyPrefix;
@@ -66,7 +65,6 @@ public class TestReconWithOzoneManagerHA {
@BeforeEach
public void setup() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
- conf.set(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, Boolean.TRUE.toString());
// Sync to disk enabled
RocksDBConfiguration dbConf = conf.getObject(RocksDBConfiguration.class);
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/TestS3SDKV1.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/TestS3SDKV1.java
index 5e9b3633be..e04c401441 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/TestS3SDKV1.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/TestS3SDKV1.java
@@ -19,7 +19,6 @@ package org.apache.hadoop.ozone.s3.awssdk.v1;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
-import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Timeout;
@@ -27,7 +26,7 @@ import org.junit.jupiter.api.Timeout;
import java.io.IOException;
/**
- * Tests the AWS S3 SDK basic operations with OM Ratis disabled.
+ * Tests the AWS S3 SDK basic operations with OM Ratis enabled.
*/
@Timeout(300)
public class TestS3SDKV1 extends AbstractS3SDKV1Tests {
@@ -35,7 +34,6 @@ public class TestS3SDKV1 extends AbstractS3SDKV1Tests {
@BeforeAll
public static void init() throws Exception {
OzoneConfiguration conf = new OzoneConfiguration();
- conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, false);
conf.setInt(ScmConfigKeys.OZONE_SCM_PIPELINE_OWNER_CONTAINER_COUNT, 1);
startCluster(conf);
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/TestS3SDKV1WithRatis.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/TestS3SDKV1WithRatis.java
deleted file mode 100644
index cb614453f6..0000000000
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/TestS3SDKV1WithRatis.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.ozone.s3.awssdk.v1;
-
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
-import org.apache.hadoop.hdds.scm.ScmConfigKeys;
-import org.apache.hadoop.ozone.OzoneConfigKeys;
-import org.apache.hadoop.ozone.om.OMConfigKeys;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-
-import java.io.IOException;
-
-/**
- * Tests the AWS S3 SDK basic operations with OM Ratis enabled.
- */
-public class TestS3SDKV1WithRatis extends AbstractS3SDKV1Tests {
-
- @BeforeAll
- public static void init() throws Exception {
- OzoneConfiguration conf = new OzoneConfiguration();
- conf.setBoolean(ScmConfigKeys.OZONE_SCM_PIPELINE_AUTO_CREATE_FACTOR_ONE,
- false);
- conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, true);
- conf.setBoolean(OzoneConfigKeys.OZONE_NETWORK_TOPOLOGY_AWARE_READ_KEY,
- true);
- startCluster(conf);
- }
-
- @AfterAll
- public static void shutdown() throws IOException {
- shutdownCluster();
- }
-}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/TestS3SDKV1WithRatisStreaming.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/TestS3SDKV1WithRatisStreaming.java
index 571d4c6490..e54cc42ef3 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/TestS3SDKV1WithRatisStreaming.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v1/TestS3SDKV1WithRatisStreaming.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.ozone.s3.awssdk.v1;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.ozone.OzoneConfigKeys;
-import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Timeout;
@@ -38,7 +37,6 @@ public class TestS3SDKV1WithRatisStreaming extends
AbstractS3SDKV1Tests {
OzoneConfiguration conf = new OzoneConfiguration();
conf.setBoolean(ScmConfigKeys.OZONE_SCM_PIPELINE_AUTO_CREATE_FACTOR_ONE,
false);
- conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, true);
conf.setBoolean(OzoneConfigKeys.OZONE_NETWORK_TOPOLOGY_AWARE_READ_KEY,
true);
conf.setBoolean(OzoneConfigKeys.HDDS_CONTAINER_RATIS_DATASTREAM_ENABLED,
true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
