-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Load: Support multi-disks awareness for IoTV2 and Pipe #15181
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
15 commits
Select commit
Hold shift + click to select a range
10dbe9d
multi-disk aware
Pengzna 9604630
get mount point
Pengzna 5a1602d
enhance log
Pengzna 7794fe5
fix up
Pengzna 8105090
fix up
Pengzna 79ee4e5
fix import
Pengzna 522d657
add test code
Pengzna 704a6ca
use file store
Pengzna 659bf69
add strategy for load disk selector
Pengzna ceb3cd7
fix description
Pengzna 50166ba
fix review
Pengzna 008260f
fix default
Pengzna 198ae91
spotless
Pengzna f7b9e40
fix review
Pengzna 7195ebb
adopt to multi-layer storage
Pengzna 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
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
66 changes: 66 additions & 0 deletions
66
...datanode/src/main/java/org/apache/iotdb/db/storageengine/load/disk/ILoadDiskSelector.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,66 @@ | ||
| /* | ||
| * 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.db.storageengine.load.disk; | ||
|
|
||
| import org.apache.iotdb.db.exception.DiskSpaceInsufficientException; | ||
|
|
||
| import java.io.File; | ||
|
|
||
| public interface ILoadDiskSelector { | ||
|
|
||
| File getTargetFile( | ||
| File fileToLoad, | ||
| String databaseName, | ||
| String dataRegionId, | ||
| long filePartitionId, | ||
| String tsfileName, | ||
| int tierLevel) | ||
| throws DiskSpaceInsufficientException; | ||
|
|
||
| enum LoadDiskSelectorType { | ||
| MIN_IO_FIRST("MIN_IO_FIRST"), | ||
| INHERIT_SYSTEM_MULTI_DISKS_SELECT_STRATEGY("INHERIT_SYSTEM_MULTI_DISKS_SELECT_STRATEGY"), | ||
| // This type is specially designed for IoTV2 and Pipe, which means IoTV2 and Pipe will follow | ||
| // the same strategy as ordinary load. | ||
| INHERIT_LOAD("INHERIT_LOAD"); | ||
|
|
||
| private final String value; | ||
|
|
||
| LoadDiskSelectorType(String value) { | ||
| this.value = value; | ||
| } | ||
|
|
||
| public String getValue() { | ||
| return value; | ||
| } | ||
|
|
||
| public static LoadDiskSelectorType fromValue(String value) { | ||
| if (value.equalsIgnoreCase(MIN_IO_FIRST.getValue())) { | ||
| return MIN_IO_FIRST; | ||
| } else if (value.equalsIgnoreCase(INHERIT_SYSTEM_MULTI_DISKS_SELECT_STRATEGY.getValue())) { | ||
| return INHERIT_SYSTEM_MULTI_DISKS_SELECT_STRATEGY; | ||
| } else if (value.equalsIgnoreCase(INHERIT_LOAD.getValue())) { | ||
| return INHERIT_LOAD; | ||
| } | ||
| // return MIN_IO_FIRST by default | ||
| return MIN_IO_FIRST; | ||
| } | ||
| } | ||
| } |
58 changes: 58 additions & 0 deletions
58
.../org/apache/iotdb/db/storageengine/load/disk/InheritSystemMultiDisksStrategySelector.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,58 @@ | ||
| /* | ||
| * 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.db.storageengine.load.disk; | ||
|
|
||
| import org.apache.iotdb.db.exception.DiskSpaceInsufficientException; | ||
| import org.apache.iotdb.db.storageengine.rescon.disk.TierManager; | ||
|
|
||
| import org.apache.tsfile.fileSystem.FSFactoryProducer; | ||
| import org.apache.tsfile.fileSystem.fsFactory.FSFactory; | ||
|
|
||
| import java.io.File; | ||
|
|
||
| public class InheritSystemMultiDisksStrategySelector implements ILoadDiskSelector { | ||
|
|
||
| protected final FSFactory fsFactory = FSFactoryProducer.getFSFactory(); | ||
|
|
||
| public InheritSystemMultiDisksStrategySelector() { | ||
| // empty body | ||
| } | ||
|
|
||
| @Override | ||
| public File getTargetFile( | ||
| File fileToLoad, | ||
| String databaseName, | ||
| String dataRegionId, | ||
| long filePartitionId, | ||
| String tsfileName, | ||
| int tierLevel) | ||
| throws DiskSpaceInsufficientException { | ||
| // inherit system multi-disks select strategy, see configuration `dn_multi_dir_strategy` | ||
| return fsFactory.getFile( | ||
| TierManager.getInstance().getNextFolderForTsFile(tierLevel, false), | ||
| databaseName | ||
| + File.separatorChar | ||
| + dataRegionId | ||
| + File.separatorChar | ||
| + filePartitionId | ||
| + File.separator | ||
| + tsfileName); | ||
| } | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.