-
Notifications
You must be signed in to change notification settings - Fork 2.9k
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
Support store block meta to RocksBlockStore, store location to heap #15238
Open
maobaolong
wants to merge
2
commits into
Alluxio:master-2.x
Choose a base branch
from
maobaolong:supportRocksBlockStoreMetaOnly
base: master-2.x
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 1 commit
Commits
Show all changes
2 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
This file contains 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 |
---|---|---|
|
@@ -16,5 +16,6 @@ | |
*/ | ||
public enum MetastoreType { | ||
HEAP, | ||
ROCKS | ||
ROCKS, | ||
ROCKS_BLOCK_META_ONLY, | ||
} |
This file contains 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 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
67 changes: 67 additions & 0 deletions
67
...rver/master/src/main/java/alluxio/master/metastore/rocks/RocksBlockMetaStoreMetaOnly.java
This file contains 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,67 @@ | ||
/* | ||
* The Alluxio Open Foundation licenses this work under the Apache License, version 2.0 | ||
* (the "License"). You may not use this work except in compliance with the License, which is | ||
* available at www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, | ||
* either express or implied, as more fully set forth in the License. | ||
* | ||
* See the NOTICE file distributed with this work for information regarding copyright ownership. | ||
*/ | ||
|
||
package alluxio.master.metastore.rocks; | ||
|
||
import alluxio.collections.TwoKeyConcurrentMap; | ||
import alluxio.metrics.MetricKey; | ||
import alluxio.metrics.MetricsSystem; | ||
import alluxio.proto.meta.Block.BlockLocation; | ||
|
||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
||
import java.util.ArrayList; | ||
import java.util.Collections; | ||
import java.util.HashMap; | ||
import java.util.List; | ||
import java.util.Map; | ||
import javax.annotation.concurrent.ThreadSafe; | ||
|
||
/** | ||
* Block store backed by RocksDB and HEAP. | ||
*/ | ||
@ThreadSafe | ||
public class RocksBlockMetaStoreMetaOnly extends RocksBlockMetaStore { | ||
private static final Logger LOG = LoggerFactory.getLogger(RocksBlockMetaStoreMetaOnly.class); | ||
// Map from block id to block locations. | ||
public final TwoKeyConcurrentMap<Long, Long, BlockLocation, Map<Long, BlockLocation>> | ||
mBlockLocations = new TwoKeyConcurrentMap<>(() -> new HashMap<>(4)); | ||
|
||
/** | ||
* Creates and initializes a rocks block store. | ||
* | ||
* @param baseDir the base directory in which to store block store metadata | ||
*/ | ||
public RocksBlockMetaStoreMetaOnly(String baseDir) { | ||
super(baseDir); | ||
MetricsSystem.registerGaugeIfAbsent(MetricKey.MASTER_BLOCK_LOCATIONS_COUNT.getName(), | ||
mBlockLocations::size); | ||
} | ||
|
||
@Override | ||
public List<BlockLocation> getLocations(long blockid) { | ||
if (!mBlockLocations.containsKey(blockid)) { | ||
return Collections.emptyList(); | ||
} | ||
return new ArrayList<>(mBlockLocations.get(blockid).values()); | ||
} | ||
|
||
@Override | ||
public void addLocation(long blockId, BlockLocation location) { | ||
mBlockLocations.addInnerValue(blockId, location.getWorkerId(), location); | ||
} | ||
|
||
@Override | ||
public void removeLocation(long blockId, long workerId) { | ||
mBlockLocations.removeInnerValue(blockId, workerId); | ||
} | ||
} |
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.
RocksBlockMetaStore()
creates BlockMeta and BlockLocation tables in RocksDB, and BlockLocation is not needed.You can probably do