-
Notifications
You must be signed in to change notification settings - Fork 488
Tiering support commit by time #2185
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
luoyuxia
wants to merge
5
commits into
apache:main
Choose a base branch
from
luoyuxia:tiering-support-commit-by-time
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
Show all changes
5 commits
Select commit
Hold shift + click to select a range
a33bba3
[lake] support lake tiering service force to commit due to timeout
luoyuxia f2bd226
address comments
luoyuxia d2a5495
address comment & remove unnecessary option
luoyuxia 38222c2
minor fix
luoyuxia 3c0655c
use freshness as max tiering duration and mark forced finished table …
luoyuxia 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
Some comments aren't visible on the classic Files Changed page.
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
58 changes: 58 additions & 0 deletions
58
...mmon/src/main/java/org/apache/fluss/flink/tiering/event/TieringReachMaxDurationEvent.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.fluss.flink.tiering.event; | ||
|
|
||
| import org.apache.flink.api.connector.source.SourceEvent; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * SourceEvent used to notify TieringSourceReader that a table has reached the maximum tiering | ||
| * duration and should be force completed. | ||
| */ | ||
| public class TieringReachMaxDurationEvent implements SourceEvent { | ||
|
|
||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| private final long tableId; | ||
|
|
||
| public TieringReachMaxDurationEvent(long tableId) { | ||
| this.tableId = tableId; | ||
| } | ||
|
|
||
| public long getTableId() { | ||
| return tableId; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (!(o instanceof TieringReachMaxDurationEvent)) { | ||
| return false; | ||
| } | ||
| TieringReachMaxDurationEvent that = (TieringReachMaxDurationEvent) o; | ||
| return tableId == that.tableId; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hashCode(tableId); | ||
| } | ||
| } | ||
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
87 changes: 87 additions & 0 deletions
87
...mmon/src/main/java/org/apache/fluss/flink/tiering/source/TieringSourceFetcherManager.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,87 @@ | ||
| /* | ||
| * 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.fluss.flink.tiering.source; | ||
|
|
||
| import org.apache.fluss.flink.adapter.SingleThreadFetcherManagerAdapter; | ||
| import org.apache.fluss.flink.tiering.source.split.TieringSplit; | ||
|
|
||
| import org.apache.flink.configuration.Configuration; | ||
| import org.apache.flink.connector.base.source.reader.RecordsWithSplitIds; | ||
| import org.apache.flink.connector.base.source.reader.fetcher.SplitFetcher; | ||
| import org.apache.flink.connector.base.source.reader.fetcher.SplitFetcherTask; | ||
| import org.apache.flink.connector.base.source.reader.splitreader.SplitReader; | ||
| import org.apache.flink.connector.base.source.reader.synchronization.FutureCompletingBlockingQueue; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.function.Consumer; | ||
| import java.util.function.Supplier; | ||
|
|
||
| /** | ||
| * The SplitFetcherManager for tiering source. This class is needed to help notify a table reaches | ||
| * the max duration of tiering to {@link TieringSplitReader}. | ||
| */ | ||
| public class TieringSourceFetcherManager<WriteResult> | ||
| extends SingleThreadFetcherManagerAdapter< | ||
| TableBucketWriteResult<WriteResult>, TieringSplit> { | ||
|
|
||
| public TieringSourceFetcherManager( | ||
| FutureCompletingBlockingQueue<RecordsWithSplitIds<TableBucketWriteResult<WriteResult>>> | ||
| elementsQueue, | ||
| Supplier<SplitReader<TableBucketWriteResult<WriteResult>, TieringSplit>> | ||
| splitReaderSupplier, | ||
| Configuration configuration, | ||
| Consumer<Collection<String>> splitFinishedHook) { | ||
| super(elementsQueue, splitReaderSupplier, configuration, splitFinishedHook); | ||
| } | ||
|
|
||
| public void markTableReachTieringMaxDuration(long tableId) { | ||
| if (!fetchers.isEmpty()) { | ||
| // The fetcher thread is still running. This should be the majority of the cases. | ||
| fetchers.values() | ||
| .forEach( | ||
| splitFetcher -> | ||
| enqueueMarkTableReachTieringMaxDurationTask( | ||
| splitFetcher, tableId)); | ||
| } else { | ||
| SplitFetcher<TableBucketWriteResult<WriteResult>, TieringSplit> splitFetcher = | ||
| createSplitFetcher(); | ||
| enqueueMarkTableReachTieringMaxDurationTask(splitFetcher, tableId); | ||
| startFetcher(splitFetcher); | ||
| } | ||
| } | ||
|
|
||
| private void enqueueMarkTableReachTieringMaxDurationTask( | ||
| SplitFetcher<TableBucketWriteResult<WriteResult>, TieringSplit> splitFetcher, | ||
| long reachTieringDeadlineTable) { | ||
| splitFetcher.enqueueTask( | ||
| new SplitFetcherTask() { | ||
| @Override | ||
| public boolean run() { | ||
| ((TieringSplitReader<WriteResult>) splitFetcher.getSplitReader()) | ||
| .handleTableReachTieringMaxDuration(reachTieringDeadlineTable); | ||
luoyuxia marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public void wakeUp() { | ||
| // do nothing | ||
| } | ||
| }); | ||
| } | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.