-
Notifications
You must be signed in to change notification settings - Fork 588
HDDS-11320. Update OM, SCM, Datanode conf for RATIS-2135. #7080
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
44 changes: 44 additions & 0 deletions
44
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/RatisConfUtils.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * 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.hdds.conf; | ||
|
|
||
| import org.apache.ratis.conf.RaftProperties; | ||
| import org.apache.ratis.grpc.GrpcConfigKeys; | ||
| import org.apache.ratis.server.RaftServerConfigKeys; | ||
| import org.apache.ratis.util.Preconditions; | ||
| import org.apache.ratis.util.SizeInBytes; | ||
|
|
||
| /** | ||
| * Utilities for Ratis configurations. | ||
| */ | ||
| public class RatisConfUtils { | ||
| /** For {@link GrpcConfigKeys}. */ | ||
| public static class Grpc { | ||
| /** For setting {@link GrpcConfigKeys#setMessageSizeMax(RaftProperties, SizeInBytes)}. */ | ||
| public static void setMessageSizeMax(RaftProperties properties, int max) { | ||
| Preconditions.assertTrue(max > 0, () -> "max = " + max + " <= 0"); | ||
|
|
||
| final long logAppenderBufferByteLimit = RaftServerConfigKeys.Log.Appender.bufferByteLimit(properties).getSize(); | ||
| Preconditions.assertTrue(max >= logAppenderBufferByteLimit, | ||
| () -> "max = " + max + " < logAppenderBufferByteLimit = " + logAppenderBufferByteLimit); | ||
|
|
||
| // Need an 1MB gap; see RATIS-2135 | ||
| GrpcConfigKeys.setMessageSizeMax(properties, SizeInBytes.valueOf(max + SizeInBytes.ONE_MB.getSize())); | ||
| } | ||
| } | ||
| } |
57 changes: 57 additions & 0 deletions
57
hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/conf/TestRatisConfUtils.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * 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.hdds.conf; | ||
|
|
||
| import org.apache.ratis.conf.RaftProperties; | ||
| import org.apache.ratis.grpc.GrpcConfigKeys; | ||
| import org.apache.ratis.server.RaftServerConfigKeys; | ||
| import org.apache.ratis.util.SizeInBytes; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * Test {@link RatisConfUtils}. | ||
| */ | ||
| public class TestRatisConfUtils { | ||
| private static final Logger LOG = LoggerFactory.getLogger(TestRatisConfUtils.class); | ||
|
|
||
| @Test | ||
| void testGrpcSetMessageSizeMax() { | ||
| final RaftProperties properties = new RaftProperties(); | ||
|
|
||
| final int logAppenderBufferByteLimit = 1000; | ||
|
|
||
| // setMessageSizeMax without setBufferByteLimit | ||
| Assertions.assertThrows(IllegalStateException.class, | ||
| () -> RatisConfUtils.Grpc.setMessageSizeMax(properties, logAppenderBufferByteLimit)); | ||
|
|
||
| RaftServerConfigKeys.Log.Appender.setBufferByteLimit(properties, SizeInBytes.valueOf(logAppenderBufferByteLimit)); | ||
|
|
||
| // setMessageSizeMax with a value smaller than logAppenderBufferByteLimit | ||
| Assertions.assertThrows(IllegalStateException.class, | ||
| () -> RatisConfUtils.Grpc.setMessageSizeMax(properties, logAppenderBufferByteLimit - 1)); | ||
|
|
||
| // setMessageSizeMax with the correct logAppenderBufferByteLimit | ||
| RatisConfUtils.Grpc.setMessageSizeMax(properties, logAppenderBufferByteLimit); | ||
|
|
||
| final SizeInBytes max = GrpcConfigKeys.messageSizeMax(properties, LOG::info); | ||
| Assertions.assertEquals(SizeInBytes.ONE_MB.getSize(), max.getSize() - logAppenderBufferByteLimit); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
but this API does not throw exception.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, I need to update the test.