-
Notifications
You must be signed in to change notification settings - Fork 479
Refactor manager split code used by fate #6115
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
keith-turner
wants to merge
1
commit into
apache:main
Choose a base branch
from
keith-turner:split-cache
base: main
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
143 changes: 143 additions & 0 deletions
143
server/manager/src/main/java/org/apache/accumulo/manager/split/SplitFileCache.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,143 @@ | ||
| /* | ||
| * 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 | ||
| * | ||
| * https://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.accumulo.manager.split; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
| import java.util.Set; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import org.apache.accumulo.core.data.TableId; | ||
| import org.apache.accumulo.core.file.FileOperations; | ||
| import org.apache.accumulo.core.file.FileSKVIterator; | ||
| import org.apache.accumulo.core.metadata.TabletFile; | ||
| import org.apache.accumulo.core.util.cache.Caches; | ||
| import org.apache.accumulo.server.ServerContext; | ||
| import org.apache.accumulo.server.conf.TableConfiguration; | ||
| import org.apache.hadoop.fs.FileSystem; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import com.github.benmanes.caffeine.cache.CacheLoader; | ||
| import com.github.benmanes.caffeine.cache.LoadingCache; | ||
| import com.github.benmanes.caffeine.cache.Weigher; | ||
|
|
||
| public class SplitFileCache { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(SplitFileCache.class); | ||
|
|
||
| private static class CacheKey { | ||
|
|
||
| final TableId tableId; | ||
| final TabletFile tabletFile; | ||
|
|
||
| public CacheKey(TableId tableId, TabletFile tabletFile) { | ||
| this.tableId = tableId; | ||
| this.tabletFile = tabletFile; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| CacheKey cacheKey = (CacheKey) o; | ||
| return Objects.equals(tableId, cacheKey.tableId) | ||
| && Objects.equals(tabletFile, cacheKey.tabletFile); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(tableId, tabletFile); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| public static <T extends TabletFile> Map<T,FileSKVIterator.FileRange> tryToGetFirstAndLastRows( | ||
| ServerContext context, TableConfiguration tableConf, Set<T> dataFiles) { | ||
|
|
||
| HashMap<T,FileSKVIterator.FileRange> dataFilesInfo = new HashMap<>(); | ||
|
|
||
| long t1 = System.currentTimeMillis(); | ||
|
|
||
| for (T dataFile : dataFiles) { | ||
|
|
||
| FileSKVIterator reader = null; | ||
| FileSystem ns = context.getVolumeManager().getFileSystemByPath(dataFile.getPath()); | ||
| try { | ||
| reader = FileOperations.getInstance().newReaderBuilder() | ||
| .forFile(dataFile, ns, ns.getConf(), tableConf.getCryptoService()) | ||
| .withTableConfiguration(tableConf).build(); | ||
|
|
||
| dataFilesInfo.put(dataFile, reader.getFileRange()); | ||
| } catch (IOException ioe) { | ||
| LOG.warn("Failed to read data file to determine first and last key : " + dataFile, ioe); | ||
| } finally { | ||
| if (reader != null) { | ||
| try { | ||
| reader.close(); | ||
| } catch (IOException ioe) { | ||
| LOG.warn("failed to close " + dataFile, ioe); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| long t2 = System.currentTimeMillis(); | ||
|
|
||
| String message = String.format("Found first and last keys for %d data files in %6.2f secs", | ||
| dataFiles.size(), (t2 - t1) / 1000.0); | ||
| if (t2 - t1 > 500) { | ||
| LOG.debug(message); | ||
| } else { | ||
| LOG.trace(message); | ||
| } | ||
|
|
||
| return dataFilesInfo; | ||
| } | ||
|
|
||
| final LoadingCache<CacheKey,FileSKVIterator.FileRange> splitFileCache; | ||
|
|
||
| public SplitFileCache(ServerContext context) { | ||
| Weigher<CacheKey,FileSKVIterator.FileRange> weigher = (key, frange) -> key.tableId.canonical() | ||
| .length() + key.tabletFile.getPath().toString().length() | ||
| + (frange.empty ? 0 | ||
| : frange.rowRange.getStartKey().getLength() + frange.rowRange.getEndKey().getLength()); | ||
|
|
||
| CacheLoader<CacheKey,FileSKVIterator.FileRange> loader = key -> { | ||
| TableConfiguration tableConf = context.getTableConfiguration(key.tableId); | ||
| return tryToGetFirstAndLastRows(context, tableConf, Set.of(key.tabletFile)) | ||
| .get(key.tabletFile); | ||
| }; | ||
|
|
||
| splitFileCache = context.getCaches().createNewBuilder(Caches.CacheName.SPLITTER_FILES, true) | ||
| .expireAfterAccess(10, TimeUnit.MINUTES).maximumWeight(10_000_000L).weigher(weigher) | ||
| .build(loader); | ||
| } | ||
|
|
||
| public FileSKVIterator.FileRange getCachedFileInfo(TableId tableId, TabletFile tabletFile) { | ||
| return splitFileCache.get(new CacheKey(tableId, tabletFile)); | ||
| } | ||
| } |
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.
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.
This change is the driver behind this entire PR. Needed to expose a more narrow type here for fate. Found this while experimenting with distributed fate.