You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ra...@apache.org on 2021/11/14 06:41:10 UTC
[ozone] branch master updated: HDDS-5982. Remove isBucketFSOptimized flag. (#2838)
This is an automated email from the ASF dual-hosted git repository.
rakeshr 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 026d878 HDDS-5982. Remove isBucketFSOptimized flag. (#2838)
026d878 is described below
commit 026d87837f7aa127735cc1d09e34cc6d036254c6
Author: Mukul Kumar Singh <ms...@apache.org>
AuthorDate: Sun Nov 14 12:10:56 2021 +0530
HDDS-5982. Remove isBucketFSOptimized flag. (#2838)
---
.../hadoop/ozone/om/codec/OmKeyInfoCodec.java | 5 ++---
.../org/apache/hadoop/ozone/om/OzoneManager.java | 1 -
.../om/ratis/utils/OzoneManagerRatisUtils.java | 25 ----------------------
.../file/TestOMFileCreateRequestWithFSO.java | 14 ------------
.../om/request/key/TestOMKeyAclRequestWithFSO.java | 11 ----------
.../request/key/TestOMKeyCommitRequestWithFSO.java | 13 -----------
.../file/TestOMFileCreateResponseWithFSO.java | 13 -----------
.../key/TestOMAllocateBlockResponseWithFSO.java | 13 -----------
.../key/TestOMKeyCommitResponseWithFSO.java | 13 -----------
.../key/TestOMKeyCreateResponseWithFSO.java | 13 -----------
.../key/TestOMKeyDeleteResponseWithFSO.java | 14 ------------
.../ozone/recon/api/TestNSSummaryEndpoint.java | 3 ---
.../ozone/recon/tasks/TestNSSummaryTask.java | 2 --
.../apache/hadoop/ozone/debug/PrefixParser.java | 2 --
14 files changed, 2 insertions(+), 140 deletions(-)
diff --git a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmKeyInfoCodec.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmKeyInfoCodec.java
index de31d87..574713e 100644
--- a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmKeyInfoCodec.java
+++ b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmKeyInfoCodec.java
@@ -34,9 +34,8 @@ import static org.apache.hadoop.ozone.ClientVersions.CURRENT_VERSION;
* Codec to encode OmKeyInfo as byte array.
*
* <p>
- * If the layout "ozone.om.metadata.layout" is PREFIX and
- * "ozone.om.enable.filesystem.paths" is TRUE. Then, DB stores only the leaf
- * node name into the 'keyName' field.
+ * If the bucket layout is FileSystem Optimized.
+ * Then, DB stores only the leaf node name into the 'keyName' field.
* <p>
* For example, the user given key path is '/a/b/c/d/e/file1', then in DB
* 'keyName' field stores only the leaf node name, which is 'file1'.
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 4c67878..37cf06c 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -3658,7 +3658,6 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
throw new IllegalArgumentException(msg.toString());
}
- OzoneManagerRatisUtils.setBucketFSOptimized(omMetadataLayoutPrefix);
String status = omMetadataLayoutPrefix ? "enabled" : "disabled";
LOG.info("Configured {}={} and {} optimized OM FS operations",
OZONE_OM_METADATA_LAYOUT, metaLayout, status);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
index 6fc029d..90746c2 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
@@ -115,11 +115,6 @@ import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_SNAPSHOT_DI
* Utility class used by OzoneManager HA.
*/
public final class OzoneManagerRatisUtils {
-
- // TODO: Temporary workaround for OM upgrade path and will be replaced once
- // upgrade HDDS-3698 story reaches consensus.
- private static boolean isBucketFSOptimized = false;
-
private static final Logger LOG = LoggerFactory
.getLogger(OzoneManagerRatisUtils.class);
@@ -127,16 +122,6 @@ public final class OzoneManagerRatisUtils {
}
/**
- * Sets enabled/disabled file system optimized path property. A true value
- * represents enabled, false represents disabled.
- *
- * @param enabledFSO enabled/disabled file system optimized
- */
- public static void setBucketFSOptimized(boolean enabledFSO) {
- OzoneManagerRatisUtils.isBucketFSOptimized = enabledFSO;
- }
-
- /**
* Create OMClientRequest which encapsulates the OMRequest.
* @param omRequest
* @return OMClientRequest
@@ -418,16 +403,6 @@ public final class OzoneManagerRatisUtils {
}
/**
- * Returns enabled/disabled file system optimized path property. A true value
- * represents FSO path is enabled, false represents disabled.
- *
- * @return true or false.
- */
- public static boolean isBucketFSOptimized() {
- return isBucketFSOptimized;
- }
-
- /**
* Get the local directory where ratis logs will be stored.
*/
public static String getOMRatisDirectory(ConfigurationSource conf) {
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestWithFSO.java
index 534b936..a3b02fe 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/file/TestOMFileCreateRequestWithFSO.java
@@ -18,17 +18,14 @@
package org.apache.hadoop.ozone.om.request.file;
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
-import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.Time;
-import org.jetbrains.annotations.NotNull;
import org.junit.Assert;
import org.junit.Test;
@@ -181,17 +178,6 @@ public class TestOMFileCreateRequestWithFSO extends TestOMFileCreateRequest {
return dirInfo;
}
- @NotNull
- @Override
- protected OzoneConfiguration getOzoneConfiguration() {
- OzoneConfiguration config = super.getOzoneConfiguration();
- // Metadata Layout prefix will be set while invoking OzoneManager#start()
- // and its not invoked in this test. Hence it is explicitly setting
- // this configuration to populate prefix tables.
- OzoneManagerRatisUtils.setBucketFSOptimized(true);
- return config;
- }
-
@Override
protected OMFileCreateRequest getOMFileCreateRequest(OMRequest omRequest) {
return new OMFileCreateRequestWithFSO(omRequest,
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequestWithFSO.java
index 9f4a08d..0b93d37 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyAclRequestWithFSO.java
@@ -17,11 +17,9 @@
*/
package org.apache.hadoop.ozone.om.request.key;
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
-import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
import org.apache.hadoop.ozone.om.request.key.acl.OMKeyAclRequest;
import org.apache.hadoop.ozone.om.request.key.acl.OMKeyAddAclRequestWithFSO;
@@ -71,15 +69,6 @@ public class TestOMKeyAclRequestWithFSO extends TestOMKeyAclRequest {
return new OMKeySetAclRequestWithFSO(setAclRequest);
}
- @Override protected OzoneConfiguration getOzoneConfiguration() {
- OzoneConfiguration config = super.getOzoneConfiguration();
- // Metadata layout prefix will be set while invoking OzoneManager#start()
- // and its not invoked in this test. Hence it is explicitly setting
- // this configuration to populate prefix tables.
- OzoneManagerRatisUtils.setBucketFSOptimized(true);
- return config;
- }
-
@Override
public BucketLayout getBucketLayout() {
return BucketLayout.FILE_SYSTEM_OPTIMIZED;
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequestWithFSO.java
index f0c6083..b57d402 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/request/key/TestOMKeyCommitRequestWithFSO.java
@@ -19,14 +19,12 @@
package org.apache.hadoop.ozone.om.request.key;
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
-import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
import org.apache.hadoop.util.Time;
@@ -88,17 +86,6 @@ public class TestOMKeyCommitRequestWithFSO extends TestOMKeyCommitRequest {
}
@NotNull
- @Override
- protected OzoneConfiguration getOzoneConfiguration() {
- OzoneConfiguration config = super.getOzoneConfiguration();
- // Metadata layout prefix will be set while invoking OzoneManager#start()
- // and its not invoked in this test. Hence it is explicitly setting
- // this configuration to populate prefix tables.
- OzoneManagerRatisUtils.setBucketFSOptimized(true);
- return config;
- }
-
- @NotNull
protected OMKeyCommitRequest getOmKeyCommitRequest(OMRequest omRequest) {
return new OMKeyCommitRequestWithFSO(omRequest,
BucketLayout.FILE_SYSTEM_OPTIMIZED);
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMFileCreateResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMFileCreateResponseWithFSO.java
index 12f3ab4..eeffe19 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMFileCreateResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/file/TestOMFileCreateResponseWithFSO.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.ozone.om.response.file;
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
-import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
import org.apache.hadoop.ozone.om.response.key.OMKeyCreateResponse;
import org.apache.hadoop.ozone.om.response.key.TestOMKeyCreateResponse;
@@ -66,17 +64,6 @@ public class TestOMFileCreateResponseWithFSO extends TestOMKeyCreateResponse {
new ArrayList<>(), clientID, bucketInfo);
}
- @NotNull
- @Override
- protected OzoneConfiguration getOzoneConfiguration() {
- OzoneConfiguration config = super.getOzoneConfiguration();
- // Metadata layout prefix will be set while invoking OzoneManager#start()
- // and its not invoked in this test. Hence it is explicitly setting
- // this configuration to populate prefix tables.
- OzoneManagerRatisUtils.setBucketFSOptimized(true);
- return config;
- }
-
@Override
public BucketLayout getBucketLayout() {
return BucketLayout.FILE_SYSTEM_OPTIMIZED;
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponseWithFSO.java
index 8c047fa..5fef60b 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMAllocateBlockResponseWithFSO.java
@@ -18,13 +18,11 @@
package org.apache.hadoop.ozone.om.response.key;
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
-import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
import org.apache.hadoop.util.Time;
@@ -72,17 +70,6 @@ public class TestOMAllocateBlockResponseWithFSO
omBucketInfo);
}
- @NotNull
- @Override
- protected OzoneConfiguration getOzoneConfiguration() {
- OzoneConfiguration config = super.getOzoneConfiguration();
- // Metadata layout prefix will be set while invoking OzoneManager#start()
- // and its not invoked in this test. Hence it is explicitly setting
- // this configuration to populate prefix tables.
- OzoneManagerRatisUtils.setBucketFSOptimized(true);
- return config;
- }
-
@Override
public BucketLayout getBucketLayout() {
return BucketLayout.FILE_SYSTEM_OPTIMIZED;
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponseWithFSO.java
index 3cc493a..5b67eec 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCommitResponseWithFSO.java
@@ -18,13 +18,11 @@
package org.apache.hadoop.ozone.om.response.key;
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
-import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.util.Time;
@@ -91,17 +89,6 @@ public class TestOMKeyCommitResponseWithFSO extends TestOMKeyCommitResponse {
keyName);
}
- @NotNull
- @Override
- protected OzoneConfiguration getOzoneConfiguration() {
- OzoneConfiguration config = super.getOzoneConfiguration();
- // Metadata layout prefix will be set while invoking OzoneManager#start()
- // and its not invoked in this test. Hence it is explicitly setting
- // this configuration to populate prefix tables.
- OzoneManagerRatisUtils.setBucketFSOptimized(true);
- return config;
- }
-
@Override
public BucketLayout getBucketLayout() {
return BucketLayout.FILE_SYSTEM_OPTIMIZED;
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponseWithFSO.java
index 893e7dc..b508e15 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyCreateResponseWithFSO.java
@@ -18,11 +18,9 @@
package org.apache.hadoop.ozone.om.response.key;
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
-import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
import org.apache.hadoop.util.Time;
@@ -38,17 +36,6 @@ public class TestOMKeyCreateResponseWithFSO extends TestOMKeyCreateResponse {
@NotNull
@Override
- protected OzoneConfiguration getOzoneConfiguration() {
- OzoneConfiguration config = super.getOzoneConfiguration();
- // Metadata layout prefix will be set while invoking OzoneManager#start()
- // and its not invoked in this test. Hence it is explicitly setting
- // this configuration to populate prefix tables.
- OzoneManagerRatisUtils.setBucketFSOptimized(true);
- return config;
- }
-
- @NotNull
- @Override
protected String getOpenKeyName() {
Assert.assertNotNull(omBucketInfo);
return omMetadataManager.getOpenFileName(
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponseWithFSO.java
index fe9cfca..f21e49f 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/response/key/TestOMKeyDeleteResponseWithFSO.java
@@ -18,15 +18,12 @@
package org.apache.hadoop.ozone.om.response.key;
-import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
-import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
import org.apache.hadoop.ozone.om.request.TestOMRequestUtils;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.util.Time;
-import org.jetbrains.annotations.NotNull;
import org.junit.Assert;
/**
@@ -72,17 +69,6 @@ public class TestOMKeyDeleteResponseWithFSO extends TestOMKeyDeleteResponse {
getOmBucketInfo().getObjectID(), 100, Time.now());
}
- @NotNull
- @Override
- protected OzoneConfiguration getOzoneConfiguration() {
- OzoneConfiguration config = super.getOzoneConfiguration();
- // Metadata layout prefix will be set while invoking OzoneManager#start()
- // and its not invoked in this test. Hence it is explicitly setting
- // this configuration to populate prefix tables.
- OzoneManagerRatisUtils.setBucketFSOptimized(true);
- return config;
- }
-
@Override
public BucketLayout getBucketLayout() {
return BucketLayout.FILE_SYSTEM_OPTIMIZED;
diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpoint.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpoint.java
index 869f2a9..1bb419f 100644
--- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpoint.java
+++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestNSSummaryEndpoint.java
@@ -34,7 +34,6 @@ import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
-import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
import org.apache.hadoop.ozone.recon.ReconConstants;
import org.apache.hadoop.ozone.recon.ReconTestInjector;
import org.apache.hadoop.ozone.recon.api.types.NamespaceSummaryResponse;
@@ -229,8 +228,6 @@ public class TestNSSummaryEndpoint {
reconNamespaceSummaryManager =
reconTestInjector.getInstance(ReconNamespaceSummaryManager.class);
nsSummaryEndpoint = reconTestInjector.getInstance(NSSummaryEndpoint.class);
- // enable FSO mode
- OzoneManagerRatisUtils.setBucketFSOptimized(true);
// populate OM DB and reprocess into Recon RocksDB
populateOMDB();
diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTask.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTask.java
index 63865c5..4137f59 100644
--- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTask.java
+++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/tasks/TestNSSummaryTask.java
@@ -24,7 +24,6 @@ import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
-import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
import org.apache.hadoop.ozone.recon.ReconConstants;
import org.apache.hadoop.ozone.recon.ReconTestInjector;
import org.apache.hadoop.ozone.recon.api.types.NSSummary;
@@ -125,7 +124,6 @@ public class TestNSSummaryTask {
.build();
reconNamespaceSummaryManager =
reconTestInjector.getInstance(ReconNamespaceSummaryManager.class);
- OzoneManagerRatisUtils.setBucketFSOptimized(true);
}
@Test
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/PrefixParser.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/PrefixParser.java
index 9219c61..cbd3d74 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/PrefixParser.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/PrefixParser.java
@@ -35,7 +35,6 @@ import org.apache.hadoop.hdds.utils.db.Table.KeyValue;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
import org.apache.hadoop.ozone.om.helpers.*;
-import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
import org.kohsuke.MetaInfServices;
import picocli.CommandLine;
import picocli.CommandLine.Model.CommandSpec;
@@ -122,7 +121,6 @@ public class PrefixParser implements Callable<Void>, SubcommandWithParent {
OzoneConfiguration conf = new OzoneConfiguration();
conf.set(OMConfigKeys.OZONE_OM_DB_DIRS, db);
- OzoneManagerRatisUtils.setBucketFSOptimized(true);
OmMetadataManagerImpl metadataManager =
new OmMetadataManagerImpl(conf);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org