diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml index 6acacd954ac0..bfeda9e49a34 100644 --- a/hadoop-hdds/common/src/main/resources/ozone-default.xml +++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml @@ -4557,13 +4557,4 @@ allowing for better identification and analysis of performance issues. - - - ozone.om.server.list.max.size - 1000 - OZONE, OM - - Configuration property to configure the max server side response size for list calls on om. - - diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java index 0a1fd9f681c5..51646f5b5461 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java @@ -619,9 +619,4 @@ private OMConfigKeys() { public static final String OZONE_OM_MAX_BUCKET = "ozone.om.max.buckets"; public static final int OZONE_OM_MAX_BUCKET_DEFAULT = 100000; - /** - * Configuration property to configure the max server side response size for list calls. - */ - public static final String OZONE_OM_SERVER_LIST_MAX_SIZE = "ozone.om.server.list.max.size"; - public static final int OZONE_OM_SERVER_LIST_MAX_SIZE_DEFAULT = 1000; } diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OmConfig.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OmConfig.java new file mode 100644 index 000000000000..efdcd5e9e4ab --- /dev/null +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OmConfig.java @@ -0,0 +1,69 @@ +/* + * 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.om; + +import org.apache.hadoop.hdds.conf.Config; +import org.apache.hadoop.hdds.conf.ConfigGroup; +import org.apache.hadoop.hdds.conf.ConfigTag; +import org.apache.hadoop.hdds.conf.PostConstruct; + +/** + * Ozone Manager configuration. + */ +@ConfigGroup(prefix = "ozone.om") +public class OmConfig { + + @Config( + key = "server.list.max.size", + defaultValue = "1000", + description = "Configuration property to configure the max server side response size for list calls on om.", + tags = { ConfigTag.OM, ConfigTag.OZONE } + ) + private long maxListSize; + + public long getMaxListSize() { + return maxListSize; + } + + public void setMaxListSize(long newValue) { + maxListSize = newValue; + validate(); + } + + @PostConstruct + public void validate() { + if (maxListSize <= 0) { + maxListSize = Defaults.SERVER_LIST_MAX_SIZE; + } + } + + /** + * String keys for tests and grep. + */ + public static final class Keys { + public static final String SERVER_LIST_MAX_SIZE = "ozone.om.server.list.max.size"; + } + + /** + * Default values for tests. + */ + static final class Defaults { + public static final long SERVER_LIST_MAX_SIZE = 1000; + } + +} diff --git a/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/TestOmConfig.java b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/TestOmConfig.java new file mode 100644 index 000000000000..e0db6384c43e --- /dev/null +++ b/hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/TestOmConfig.java @@ -0,0 +1,54 @@ +/* + * 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.om; + +import org.apache.hadoop.hdds.conf.MutableConfigurationSource; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +import static org.assertj.core.api.Assertions.assertThat; + +class TestOmConfig { + + @Test + void acceptsValidValues() { + final long validMaxListSize = 42; + MutableConfigurationSource conf = new OzoneConfiguration(); + conf.setLong(OmConfig.Keys.SERVER_LIST_MAX_SIZE, validMaxListSize); + + OmConfig subject = conf.getObject(OmConfig.class); + + assertThat(subject.getMaxListSize()) + .isEqualTo(validMaxListSize); + } + + @ParameterizedTest + @ValueSource(longs = {-1, 0}) + void overridesInvalidListSize(long invalidValue) { + MutableConfigurationSource conf = new OzoneConfiguration(); + conf.setLong(OmConfig.Keys.SERVER_LIST_MAX_SIZE, invalidValue); + + OmConfig subject = conf.getObject(OmConfig.class); + + assertThat(subject.getMaxListSize()) + .isEqualTo(OmConfig.Defaults.SERVER_LIST_MAX_SIZE); + } + +} 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 ee004af1fc45..83c75f66af24 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 @@ -59,6 +59,7 @@ import org.apache.hadoop.ozone.om.OMConfigKeys; import org.apache.hadoop.ozone.om.OMMetadataManager; import org.apache.hadoop.ozone.om.OMMetrics; +import org.apache.hadoop.ozone.om.OmConfig; import org.apache.hadoop.ozone.om.OzonePrefixPathImpl; import org.apache.hadoop.ozone.om.TrashPolicyOzone; import org.apache.hadoop.ozone.om.exceptions.OMException; @@ -118,7 +119,6 @@ import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_ITERATE_BATCH_SIZE; import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX; import static org.apache.hadoop.ozone.OzoneConsts.OZONE_URI_DELIMITER; -import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SERVER_LIST_MAX_SIZE; import static org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.KEY_NOT_FOUND; import static org.apache.hadoop.ozone.om.helpers.BucketLayout.FILE_SYSTEM_OPTIMIZED; import static org.assertj.core.api.Assertions.assertThat; @@ -184,7 +184,7 @@ void init() throws Exception { 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.setInt(OZONE_OM_SERVER_LIST_MAX_SIZE, 2); + conf.setInt(OmConfig.Keys.SERVER_LIST_MAX_SIZE, 2); 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/TestOzoneFsSnapshot.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsSnapshot.java index ccfa0625800a..3ad749564844 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsSnapshot.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestOzoneFsSnapshot.java @@ -35,6 +35,7 @@ import org.apache.hadoop.ozone.MiniOzoneCluster; import org.apache.hadoop.ozone.om.KeyManagerImpl; import org.apache.hadoop.ozone.om.OMConfigKeys; +import org.apache.hadoop.ozone.om.OmConfig; import org.apache.hadoop.ozone.om.OzoneManager; import org.apache.hadoop.ozone.om.helpers.SnapshotInfo; import org.apache.hadoop.util.ToolRunner; @@ -57,7 +58,6 @@ import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX; import static org.apache.hadoop.ozone.OzoneConsts.OZONE_OFS_URI_SCHEME; import static org.apache.hadoop.ozone.OzoneConsts.OM_SNAPSHOT_INDICATOR; -import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SERVER_LIST_MAX_SIZE; import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SNAPSHOT_SST_FILTERING_SERVICE_INTERVAL; import static org.apache.hadoop.ozone.om.OmSnapshotManager.getSnapshotPath; import static org.assertj.core.api.Assertions.assertThat; @@ -96,7 +96,7 @@ static void initClass() throws Exception { conf.setBoolean(OMConfigKeys.OZONE_FILESYSTEM_SNAPSHOT_ENABLED_KEY, true); conf.setTimeDuration(OZONE_SNAPSHOT_DELETING_SERVICE_INTERVAL, 1, TimeUnit.SECONDS); conf.setInt(OZONE_SNAPSHOT_SST_FILTERING_SERVICE_INTERVAL, KeyManagerImpl.DISABLE_VALUE); - conf.setInt(OZONE_OM_SERVER_LIST_MAX_SIZE, 20); + conf.setInt(OmConfig.Keys.SERVER_LIST_MAX_SIZE, 20); conf.setInt(OZONE_FS_LISTING_PAGE_SIZE, 30); // Start the cluster diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java index 7e9744d01238..b2d1400cc584 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeys.java @@ -48,7 +48,6 @@ import static com.google.common.collect.Lists.newLinkedList; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_CLIENT_LIST_CACHE_SIZE; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_ITERATE_BATCH_SIZE; -import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SERVER_LIST_MAX_SIZE; import static org.junit.jupiter.params.provider.Arguments.of; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -81,7 +80,7 @@ public static void init() throws Exception { // Set the number of keys to be processed during batch operate. conf.setInt(OZONE_FS_ITERATE_BATCH_SIZE, 3); conf.setInt(OZONE_CLIENT_LIST_CACHE_SIZE, 3); - conf.setInt(OZONE_OM_SERVER_LIST_MAX_SIZE, 2); + conf.setInt(OmConfig.Keys.SERVER_LIST_MAX_SIZE, 2); cluster = MiniOzoneCluster.newBuilder(conf).build(); cluster.waitForClusterToBeReady(); client = cluster.newClient(); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java index 0829c8fc19a8..e7ee80e5c246 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestListKeysWithFSO.java @@ -47,7 +47,6 @@ import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_CLIENT_LIST_CACHE_SIZE; import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_ITERATE_BATCH_SIZE; -import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SERVER_LIST_MAX_SIZE; import static org.junit.jupiter.api.Assertions.assertEquals; /** @@ -82,7 +81,7 @@ public static void init() throws Exception { // Set the number of keys to be processed during batch operate. conf.setInt(OZONE_FS_ITERATE_BATCH_SIZE, 3); conf.setInt(OZONE_CLIENT_LIST_CACHE_SIZE, 3); - conf.setInt(OZONE_OM_SERVER_LIST_MAX_SIZE, 2); + conf.setInt(OmConfig.Keys.SERVER_LIST_MAX_SIZE, 2); cluster = MiniOzoneCluster.newBuilder(conf).build(); cluster.waitForClusterToBeReady(); client = cluster.newClient(); 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 25684cc4527d..70b3feb1e6a8 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 @@ -373,6 +373,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl private ScmTopologyClient scmTopologyClient; private final Text omRpcAddressTxt; private OzoneConfiguration configuration; + private OmConfig config; private RPC.Server omRpcServer; private GrpcOzoneManagerServer omS3gGrpcServer; private final InetSocketAddress omRpcAddress; @@ -4136,9 +4137,14 @@ public OzoneConfiguration getConfiguration() { return configuration; } + public OmConfig getConfig() { + return config; + } + @VisibleForTesting public void setConfiguration(OzoneConfiguration conf) { this.configuration = conf; + config = conf.getObject(OmConfig.class); } public OzoneConfiguration reloadConfiguration() { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java index a31783f29c48..751bb2cb1410 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java @@ -147,8 +147,6 @@ import com.google.common.collect.Lists; -import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SERVER_LIST_MAX_SIZE; -import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SERVER_LIST_MAX_SIZE_DEFAULT; import static org.apache.hadoop.ozone.om.upgrade.OMLayoutFeature.HBASE_SUPPORT; import static org.apache.hadoop.ozone.om.upgrade.OMLayoutFeature.MULTITENANCY_SCHEMA; import static org.apache.hadoop.ozone.om.upgrade.OMLayoutFeature.FILESYSTEM_SNAPSHOT; @@ -188,11 +186,7 @@ public class OzoneManagerRequestHandler implements RequestHandler { public OzoneManagerRequestHandler(OzoneManager om) { this.impl = om; - this.maxKeyListSize = om.getConfiguration().getLong(OZONE_OM_SERVER_LIST_MAX_SIZE, - OZONE_OM_SERVER_LIST_MAX_SIZE_DEFAULT); - if (this.maxKeyListSize <= 0) { - this.maxKeyListSize = OZONE_OM_SERVER_LIST_MAX_SIZE_DEFAULT; - } + this.maxKeyListSize = om.getConfig().getMaxListSize(); } //TODO simplify it to make it shorter diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMMultiTenantManager.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMMultiTenantManager.java index 57ac3f29078f..ca3d687f3337 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMMultiTenantManager.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOMMultiTenantManager.java @@ -133,6 +133,8 @@ public void testMultiTenancyRequestsWhenDisabled() throws IOException { doCallRealMethod().when(ozoneManager).checkS3MultiTenancyEnabled(); final OzoneConfiguration conf = new OzoneConfiguration(); when(ozoneManager.getConfiguration()).thenReturn(conf); + final OmConfig omConfig = conf.getObject(OmConfig.class); + when(ozoneManager.getConfig()).thenReturn(omConfig); when(ozoneManager.isS3MultiTenancyEnabled()).thenReturn(false); final String tenantId = "test-tenant"; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisRequest.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisRequest.java similarity index 96% rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisRequest.java rename to hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisRequest.java index 0b517539b321..5a09226a2671 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisRequest.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisRequest.java @@ -25,6 +25,7 @@ import org.apache.hadoop.hdds.utils.db.cache.CacheValue; import org.apache.hadoop.ozone.om.OMConfigKeys; import org.apache.hadoop.ozone.om.OMMetadataManager; +import org.apache.hadoop.ozone.om.OmConfig; import org.apache.hadoop.ozone.om.OmMetadataManagerImpl; import org.apache.hadoop.ozone.om.OzoneManager; import org.apache.hadoop.ozone.om.exceptions.OMException; @@ -110,6 +111,8 @@ public void testUnknownRequestHandling() ozoneManager); when(ozoneManager.getMetadataManager()).thenReturn(omMetadataManager); when(ozoneManager.getConfiguration()).thenReturn(ozoneConfiguration); + final OmConfig omConfig = ozoneConfiguration.getObject(OmConfig.class); + when(ozoneManager.getConfig()).thenReturn(omConfig); OzoneManagerRatisServer ratisServer = mock(OzoneManagerRatisServer.class); ProtocolMessageMetrics protocolMessageMetrics = diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java index 1e4787df427c..a9942e9cd147 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerRatisServer.java @@ -32,6 +32,7 @@ import org.apache.hadoop.hdds.utils.TransactionInfo; import org.apache.hadoop.hdds.security.SecurityConfig; import org.apache.hadoop.ozone.om.OMStorage; +import org.apache.hadoop.ozone.om.OmConfig; import org.apache.hadoop.ozone.security.OMCertificateClient; import org.apache.hadoop.ozone.OmUtils; import org.apache.hadoop.ozone.OzoneConsts; @@ -122,6 +123,8 @@ public void init(@TempDir Path metaDirPath) throws Exception { initialTermIndex = TermIndex.valueOf(0, 0); when(ozoneManager.getTransactionInfo()).thenReturn(TransactionInfo.DEFAULT_VALUE); when(ozoneManager.getConfiguration()).thenReturn(conf); + final OmConfig omConfig = conf.getObject(OmConfig.class); + when(ozoneManager.getConfig()).thenReturn(omConfig); secConfig = new SecurityConfig(conf); HddsProtos.OzoneManagerDetailsProto omInfo = OzoneManager.getOmDetailsProto(conf, omID); diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerStateMachine.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerStateMachine.java index 636dc6d6cd16..9aafde774b1a 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerStateMachine.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/ratis/TestOzoneManagerStateMachine.java @@ -23,6 +23,7 @@ import org.apache.hadoop.ozone.audit.AuditMessage; import org.apache.hadoop.ozone.om.OMConfigKeys; import org.apache.hadoop.ozone.om.OMMetadataManager; +import org.apache.hadoop.ozone.om.OmConfig; import org.apache.hadoop.ozone.om.OmMetadataManagerImpl; import org.apache.hadoop.ozone.om.OzoneManager; import org.apache.hadoop.ozone.om.OzoneManagerPrepareState; @@ -100,6 +101,8 @@ public void setup() throws Exception { when(ozoneManagerRatisServer.getOzoneManager()).thenReturn(ozoneManager); when(ozoneManager.getTransactionInfo()).thenReturn(mock(TransactionInfo.class)); when(ozoneManager.getConfiguration()).thenReturn(conf); + final OmConfig omConfig = conf.getObject(OmConfig.class); + when(ozoneManager.getConfig()).thenReturn(omConfig); ozoneManagerStateMachine = new OzoneManagerStateMachine(ozoneManagerRatisServer, false); } diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/protocolPB/TestOzoneManagerRequestHandler.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/protocolPB/TestOzoneManagerRequestHandler.java index 996cab082775..0010206a00dc 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/protocolPB/TestOzoneManagerRequestHandler.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/protocolPB/TestOzoneManagerRequestHandler.java @@ -21,6 +21,7 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.proto.HddsProtos; +import org.apache.hadoop.ozone.om.OmConfig; import org.apache.hadoop.ozone.om.OzoneManager; import org.apache.hadoop.ozone.om.helpers.BasicOmKeyInfo; import org.apache.hadoop.ozone.om.helpers.ListKeysLightResult; @@ -40,8 +41,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SERVER_LIST_MAX_SIZE; - /** * Test class to test out OzoneManagerRequestHandler. */ @@ -49,10 +48,10 @@ public class TestOzoneManagerRequestHandler { private OzoneManagerRequestHandler getRequestHandler(int limitListKeySize) { - OzoneConfiguration conf = new OzoneConfiguration(); - conf.setInt(OZONE_OM_SERVER_LIST_MAX_SIZE, limitListKeySize); + OmConfig config = OzoneConfiguration.newInstanceOf(OmConfig.class); + config.setMaxListSize(limitListKeySize); OzoneManager ozoneManager = Mockito.mock(OzoneManager.class); - Mockito.when(ozoneManager.getConfiguration()).thenReturn(conf); + Mockito.when(ozoneManager.getConfig()).thenReturn(config); return new OzoneManagerRequestHandler(ozoneManager); }