fix: initialize lastCompletedTxnAndMetadata before recommitInstant in Flink StreamWriteOperatorCoordinator #19023
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
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
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,70 @@ | ||
| /* | ||
| * 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.hudi.util; | ||
|
|
||
| import org.apache.hudi.common.table.timeline.HoodieInstant; | ||
| import org.apache.hudi.common.util.Option; | ||
| import org.apache.hudi.common.util.collection.Pair; | ||
|
|
||
| import lombok.AccessLevel; | ||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.HashSet; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * Memorizes transaction states by instant for Flink streaming writes. | ||
| */ | ||
| public class TxnStateMemo { | ||
|
|
||
| private final Map<String, TxnState> memo = new HashMap<>(); | ||
|
|
||
| public void memo(String instant, | ||
| Option<Pair<HoodieInstant, Map<String, String>>> lastCompletedTxnAndMetadata, | ||
| Set<String> conflictResolutionExclusionInstants, | ||
| Set<String> pendingInflightAndRequestedInstants) { | ||
| memo.put(instant, new TxnState( | ||
| lastCompletedTxnAndMetadata, | ||
| new HashSet<>(conflictResolutionExclusionInstants), | ||
| new HashSet<>(pendingInflightAndRequestedInstants))); | ||
| } | ||
|
|
||
| public Option<TxnState> get(String instant) { | ||
| return Option.ofNullable(memo.get(instant)); | ||
| } | ||
|
|
||
| public void slip(String instant) { | ||
|
Contributor
There was a problem hiding this comment. 🤖 nit: - AI-generated; verify before applying. React 👍/👎 to flag quality. |
||
| memo.remove(instant); | ||
| } | ||
|
|
||
| public boolean contains(String currentInstant) { | ||
| return memo.containsKey(currentInstant); | ||
| } | ||
|
|
||
| @Getter | ||
| @AllArgsConstructor(access = AccessLevel.PRIVATE) | ||
| public static class TxnState { | ||
| private final Option<Pair<HoodieInstant, Map<String, String>>> lastCompletedTxnAndMetadata; | ||
| private final Set<String> conflictResolutionExclusionInstants; | ||
| private final Set<String> pendingInflightAndRequestedInstants; | ||
| } | ||
| } | ||
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 |
|---|---|---|
|
|
@@ -435,10 +435,9 @@ private CompletableFuture<CoordinationResponse> handleInFlightInstantsRequest(Co | |
|
|
||
| private void restoreEvents() { | ||
| if (this.eventBuffers.nonEmpty()) { | ||
| final HoodieTimeline completedTimeline = this.metaClient.reloadActiveTimeline().filterCompletedInstants(); | ||
| this.eventBuffers.getEventBufferStream() | ||
| .forEach(entry -> recommitInstant(completedTimeline, entry.getKey(), entry.getValue().getLeft(), entry.getValue().getRight())); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -510,8 +509,6 @@ private void initEventBufferIfNecessary() { | |
| private String startInstant() { | ||
| // refresh the meta client which is reused | ||
| metaClient.reloadActiveTimeline(); | ||
| // put the assignment in front of metadata generation, | ||
| // because the instant request from write task is asynchronous. | ||
| this.instant = this.writeClient.startCommit(tableState.commitAction, this.metaClient); | ||
|
|
@@ -523,6 +520,8 @@ private String startInstant() { | |
| this.writeClient.setWriteTimer(tableState.commitAction); | ||
| log.info("Create instant [{}] for table [{}] with type [{}]", this.instant, | ||
| this.conf.get(FlinkOptions.TABLE_NAME), conf.get(FlinkOptions.TABLE_TYPE)); | ||
| // refresh the last txn metadata | ||
| this.writeClient.preTxn(tableState.operationType, this.metaClient, this.instant, this.eventBuffers.getAllInstants()); | ||
| return this.instant; | ||
| } | ||
|
|
||
|
|
@@ -547,10 +546,14 @@ private boolean recommitInstant(HoodieTimeline completedTimeline, long checkpoin | |
| if (writeClient.getConfig().getFailedWritesCleanPolicy().isLazy()) { | ||
| writeClient.getHeartbeatClient().start(instant); | ||
| } | ||
| // Initialize the transaction state so same-writer instants can be excluded | ||
| // during OCC conflict resolution. | ||
| writeClient.preTxn(tableState.operationType, this.metaClient, instant, this.eventBuffers.getAllInstants()); | ||
|
Contributor
There was a problem hiding this comment. 🤖 I think the multi-pending recommit case is still broken — could you double-check? With A and B both inflight on restart, after A's recommit succeeds, - AI-generated; verify before applying. React 👍/👎 to flag quality. |
||
| return commitInstant(checkpointId, instant, bootstrapBuffer); | ||
| } else { | ||
| // clean the corresponding event buffer if the instant is already committed. | ||
| eventBuffers.reset(checkpointId); | ||
| writeClient.cleanResources(instant); | ||
| return false; | ||
| } | ||
| } | ||
|
|
@@ -614,24 +617,26 @@ private boolean commitInstants(long checkpointId) { | |
| * @return true if the write statuses are committed successfully. | ||
| */ | ||
| private boolean commitInstant(long checkpointId, String instant, EventBuffer eventBuffer) { | ||
| try { | ||
| if (eventBuffer.isEmptyDataWriteBuffer()) { | ||
| // all the data write tasks are reset by failover, reset the while buffer and returns early. | ||
| this.eventBuffers.reset(checkpointId); | ||
| return false; | ||
| } | ||
|
|
||
| List<WriteStatus> dataWriteResults = eventBuffer.collectDataWriteStatuses(); | ||
| if (dataWriteResults.isEmpty() && !OptionsResolver.allowCommitOnEmptyBatch(conf)) { | ||
| // No data has written, reset the buffer and returns early | ||
| this.eventBuffers.reset(checkpointId); | ||
| return false; | ||
| } | ||
| doCommit(checkpointId, instant, dataWriteResults, eventBuffer.collectIndexWriteStatuses()); | ||
| return true; | ||
| } finally { | ||
| // Stop the heartbeat and remove the memoized transaction state regardless of | ||
| // whether commit succeeds or fails before the coordinator restarts. | ||
| writeClient.cleanResources(instant); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -652,6 +657,7 @@ private void doCommit(long checkpointId, String instant, List<WriteStatus> dataW | |
| FlinkValidatorUtils.runValidators(conf, instant, allWriteStatus, | ||
| checkpointCommitMetadata, () -> StreamerUtil.getPreviousCommitMetadata(this.metaClient)); | ||
|
|
||
| this.writeClient.loadTxn(instant); | ||
| boolean success = writeClient.commit(instant, allWriteStatus, Option.of(checkpointCommitMetadata), | ||
| tableState.commitAction, partitionToReplacedFileIds); | ||
| if (success) { | ||
|
|
||
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.
🤖 nit: could you rename this to
recordorput? Using a noun as a verb (txnStateMemo.memo(...)at the call site) is unusual in Java APIs and reads a bit awkwardly.- AI-generated; verify before applying. React 👍/👎 to flag quality.