-
Notifications
You must be signed in to change notification settings - Fork 140
IGNITE-28075 Make writeBufferSize for RocksDB log storage configurable #7724
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
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
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
57 changes: 57 additions & 0 deletions
57
...ationTest/java/org/apache/ignite/internal/raftsnapshot/ItLogStorageConfigurationTest.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 | ||
| * | ||
| * 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.ignite.internal.raftsnapshot; | ||
|
|
||
| import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.is; | ||
|
|
||
| import org.apache.ignite.Ignite; | ||
| import org.apache.ignite.internal.ClusterPerTestIntegrationTest; | ||
| import org.apache.ignite.internal.ConfigOverride; | ||
| import org.apache.ignite.internal.raft.storage.LogStorageManager; | ||
| import org.apache.ignite.internal.raft.storage.impl.DefaultLogStorageManager; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.rocksdb.ColumnFamilyOptions; | ||
|
|
||
| class ItLogStorageConfigurationTest extends ClusterPerTestIntegrationTest { | ||
| private Ignite node; | ||
|
|
||
| @Override | ||
| protected int initialNodes() { | ||
| return 1; | ||
| } | ||
|
|
||
| @BeforeEach | ||
| void prepare() { | ||
| node = cluster.node(0); | ||
| } | ||
|
|
||
| @Test | ||
| @ConfigOverride(name = "ignite.system.properties.partitionsRaftLogStorageWriteBufferSize", value = "" + (99L * 1024 * 1024)) | ||
| void partitionsLogStorageWriteBufferSizeIsTakenFromConfiguration() throws Exception { | ||
| LogStorageManager logStorageManager = unwrapIgniteImpl(node).partitionsLogStorageManager(); | ||
| DefaultLogStorageManager defaultLogStorageManager = (DefaultLogStorageManager) logStorageManager; | ||
|
|
||
| @SuppressWarnings("resource") | ||
| ColumnFamilyOptions cfOptions = defaultLogStorageManager.dataColumnFamilyHandle().getDescriptor().getOptions(); | ||
|
|
||
| assertThat(cfOptions.writeBufferSize(), is(99L * 1024 * 1024)); | ||
| } | ||
| } | ||
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
74 changes: 74 additions & 0 deletions
74
.../src/main/java/org/apache/ignite/internal/raft/storage/impl/RocksDbLogStorageOptions.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,74 @@ | ||
| /* | ||
| * 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.ignite.internal.raft.storage.impl; | ||
|
|
||
| import org.apache.ignite.internal.configuration.SystemLocalView; | ||
| import org.apache.ignite.internal.configuration.SystemPropertyView; | ||
| import org.apache.ignite.internal.logger.IgniteLogger; | ||
| import org.apache.ignite.internal.logger.Loggers; | ||
| import org.rocksdb.util.SizeUnit; | ||
|
|
||
| /** | ||
| * RocksDB-specific options for RocksDB-based log storage. | ||
| */ | ||
| public class RocksDbLogStorageOptions { | ||
| private static final IgniteLogger LOG = Loggers.forClass(RocksDbLogStorageOptions.class); | ||
|
|
||
| private static final String PARTITIONS_RAFT_LOG_STORAGE_WRITE_BUFFER_SIZE_PROPERTY_NAME = "partitionsRaftLogStorageWriteBufferSize"; | ||
|
|
||
| private static final long DEFAULT_WRITE_BUFFER_SIZE = 64 * SizeUnit.MB; | ||
|
|
||
| private final long writeBufferSize; | ||
|
|
||
| public static RocksDbLogStorageOptions forPartitions(SystemLocalView properties) { | ||
| return new RocksDbLogStorageOptions(partitionsRaftLogStorageWriteBufferSize(properties)); | ||
| } | ||
|
|
||
| private static long partitionsRaftLogStorageWriteBufferSize(SystemLocalView properties) { | ||
| SystemPropertyView property = properties.properties().get(PARTITIONS_RAFT_LOG_STORAGE_WRITE_BUFFER_SIZE_PROPERTY_NAME); | ||
|
|
||
| if (property == null) { | ||
| return DEFAULT_WRITE_BUFFER_SIZE; | ||
| } | ||
|
|
||
| try { | ||
| return Long.parseLong(property.propertyValue()); | ||
| } catch (NumberFormatException e) { | ||
| LOG.warn( | ||
| "Failed to parse partitions writeBufferSize '{}', default value will be used ({})", | ||
| e, | ||
| property.propertyValue(), | ||
| DEFAULT_WRITE_BUFFER_SIZE | ||
| ); | ||
|
|
||
| return DEFAULT_WRITE_BUFFER_SIZE; | ||
| } | ||
rpuch marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| public static RocksDbLogStorageOptions defaults() { | ||
| return new RocksDbLogStorageOptions(DEFAULT_WRITE_BUFFER_SIZE); | ||
| } | ||
|
|
||
| private RocksDbLogStorageOptions(long writeBufferSize) { | ||
| this.writeBufferSize = writeBufferSize; | ||
| } | ||
|
|
||
| public long writeBufferSize() { | ||
| return writeBufferSize; | ||
| } | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.