-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Pipe: add ConfigNode memory control for log reducer #18069
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
Open
Caideyipi
wants to merge
1
commit into
apache:master
Choose a base branch
from
Caideyipi:codex/confignode-pipe-log-reducer-memory
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
96 changes: 96 additions & 0 deletions
96
...ore/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeMemoryConfig.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,96 @@ | ||
| /* | ||
| * 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.iotdb.confignode.conf; | ||
|
|
||
| import org.apache.iotdb.commons.conf.TrimProperties; | ||
| import org.apache.iotdb.commons.memory.MemoryConfig; | ||
| import org.apache.iotdb.commons.memory.MemoryManager; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class ConfigNodeMemoryConfig { | ||
| public static final String PIPE_MEMORY_MANAGER_NAME = "Pipe"; | ||
|
|
||
| private static final Logger LOGGER = LoggerFactory.getLogger(ConfigNodeMemoryConfig.class); | ||
|
|
||
| /** The memory manager of on heap. */ | ||
| private MemoryManager onHeapMemoryManager; | ||
|
|
||
| /** Memory manager for the pipe. */ | ||
| private MemoryManager pipeMemoryManager; | ||
|
|
||
| public void init(final TrimProperties properties) { | ||
| String memoryAllocateProportion = properties.getProperty("confignode_memory_proportion", null); | ||
| if (memoryAllocateProportion == null) { | ||
| memoryAllocateProportion = properties.getProperty("config_node_memory_proportion", null); | ||
| if (memoryAllocateProportion != null) { | ||
| LOGGER.warn( | ||
| "The parameter config_node_memory_proportion is deprecated, " | ||
| + "please use confignode_memory_proportion instead."); | ||
| } | ||
|
Comment on lines
+44
to
+48
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i18n |
||
| } | ||
|
|
||
| final long maxMemoryAvailable = Runtime.getRuntime().maxMemory(); | ||
| long pipeMemorySize = maxMemoryAvailable / 10; | ||
| long freeMemorySize = maxMemoryAvailable - pipeMemorySize; | ||
|
|
||
| if (memoryAllocateProportion != null) { | ||
| final String[] proportions = memoryAllocateProportion.split(":"); | ||
| if (proportions.length >= 2) { | ||
| int proportionSum = 0; | ||
| for (final String proportion : proportions) { | ||
| proportionSum += Integer.parseInt(proportion.trim()); | ||
| } | ||
|
|
||
| if (proportionSum != 0) { | ||
| pipeMemorySize = | ||
| maxMemoryAvailable * Integer.parseInt(proportions[0].trim()) / proportionSum; | ||
| freeMemorySize = maxMemoryAvailable - pipeMemorySize; | ||
| } | ||
| } else { | ||
| LOGGER.warn( | ||
| "The parameter confignode_memory_proportion should be in the form of Pipe:Free, " | ||
| + "but got {}. Use default value 1:9.", | ||
| memoryAllocateProportion); | ||
| } | ||
| } | ||
|
|
||
| onHeapMemoryManager = | ||
| MemoryConfig.global().getOrCreateMemoryManager("ConfigNodeOnHeap", maxMemoryAvailable); | ||
| pipeMemoryManager = | ||
| onHeapMemoryManager.getOrCreateMemoryManager(PIPE_MEMORY_MANAGER_NAME, pipeMemorySize); | ||
| // Keep the rest of ConfigNode heap unconnected for now. The memory framework currently only | ||
| // serves PipePeriodicalLogReducer on ConfigNode. | ||
|
|
||
| LOGGER.info( | ||
| "initial ConfigNode allocateMemoryForPipe = {}", | ||
| pipeMemoryManager.getTotalMemorySizeInBytes()); | ||
| LOGGER.info("initial ConfigNode freeMemory = {}", freeMemorySize); | ||
| } | ||
|
|
||
| public MemoryManager getOnHeapMemoryManager() { | ||
| return onHeapMemoryManager; | ||
| } | ||
|
|
||
| public MemoryManager getPipeMemoryManager() { | ||
| return pipeMemoryManager; | ||
| } | ||
| } | ||
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
61 changes: 61 additions & 0 deletions
61
...confignode/src/test/java/org/apache/iotdb/confignode/conf/ConfigNodeMemoryConfigTest.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,61 @@ | ||
| /* | ||
| * 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.iotdb.confignode.conf; | ||
|
|
||
| import org.apache.iotdb.commons.conf.TrimProperties; | ||
| import org.apache.iotdb.commons.memory.MemoryConfig; | ||
|
|
||
| import org.junit.After; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| public class ConfigNodeMemoryConfigTest { | ||
|
|
||
| private static final String ON_HEAP_MEMORY_MANAGER_NAME = "ConfigNodeOnHeap"; | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| MemoryConfig.global().releaseChildMemoryManager(ON_HEAP_MEMORY_MANAGER_NAME); | ||
| } | ||
|
|
||
| @After | ||
| public void tearDown() { | ||
| MemoryConfig.global().releaseChildMemoryManager(ON_HEAP_MEMORY_MANAGER_NAME); | ||
| } | ||
|
|
||
| @Test | ||
| public void testConfigNodeMemoryFrameworkOnlyCreatesPipeMemoryManager() { | ||
| final TrimProperties properties = new TrimProperties(); | ||
| properties.setProperty("confignode_memory_proportion", "1:3"); | ||
|
|
||
| final ConfigNodeMemoryConfig memoryConfig = new ConfigNodeMemoryConfig(); | ||
| memoryConfig.init(properties); | ||
|
|
||
| Assert.assertEquals( | ||
| Runtime.getRuntime().maxMemory() / 4, | ||
| memoryConfig.getPipeMemoryManager().getTotalMemorySizeInBytes()); | ||
| Assert.assertNotNull( | ||
| memoryConfig | ||
| .getOnHeapMemoryManager() | ||
| .getMemoryManager(ConfigNodeMemoryConfig.PIPE_MEMORY_MANAGER_NAME)); | ||
| Assert.assertNull(memoryConfig.getOnHeapMemoryManager().getMemoryManager("Free")); | ||
| } | ||
| } |
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
Oops, something went wrong.
Oops, something went wrong.
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.
just keep one