Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[HUDI-5686] Fixes data loss due to rollbacks #7828

Closed
wants to merge 5 commits into from
Closed

[HUDI-5686] Fixes data loss due to rollbacks #7828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49ab579
Merge pull request #1 from apache/master
pushpavanthar Feb 2, 2023
f4cebdf
avoid creating new instants for rollbacks
Feb 2, 2023
5cb99f4
Merge branch 'master' of github.com:apache/hudi into HUDI-5686
Feb 3, 2023
f84a6df
Merge branch 'master' of github.com:apache/hudi into HUDI-5686
Feb 4, 2023
2ec476d
perform rollback before initiating commit instant
Feb 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...client/hudi-client-common/src/main/java/org/apache/hudi/client/BaseHoodieWriteClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,15 @@ public String startCommit(String actionType, HoodieTableMetaClient metaClient) {
return instantTime;
}


/**
* Provides a new commit time for a write operation (insert/update/delete/insert_overwrite/insert_overwrite_table) with specified action.
*/
public String startCommit(String actionType) {
HoodieTableMetaClient metaClient = createMetaClient(true);
return startCommit(actionType, metaClient);
}

/**
* Provides a new commit time for a write operation (insert/update/delete/insert_overwrite/insert_overwrite_table) without specified action.
* @param instantTime Instant time to be generated
Expand Down
5 changes: 1 addition & 4 deletions hudi-utilities/src/main/java/org/apache/hudi/utilities/deltastreamer/DeltaSync.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
import org.apache.hudi.common.table.HoodieTableMetaClient;
import org.apache.hudi.common.table.TableSchemaResolver;
import org.apache.hudi.common.table.log.block.HoodieLogBlock.HoodieLogBlockType;
import org.apache.hudi.common.table.timeline.HoodieActiveTimeline;
import org.apache.hudi.common.table.timeline.HoodieInstant;
import org.apache.hudi.common.table.timeline.HoodieTimeline;
import org.apache.hudi.common.util.CommitUtils;
Expand Down Expand Up @@ -759,10 +758,8 @@ private String startCommit() {
RuntimeException lastException = null;
while (retryNum <= maxRetries) {
try {
String instantTime = HoodieActiveTimeline.createNewInstantTime();
String commitActionType = CommitUtils.getCommitActionType(cfg.operation, HoodieTableType.valueOf(cfg.tableType));
writeClient.startCommitWithTime(instantTime, commitActionType);
return instantTime;
return writeClient.startCommit(commitActionType);
} catch (IllegalArgumentException ie) {
lastException = ie;
LOG.error("Got error trying to start a new commit. Retrying after sleeping for a sec", ie);
Expand Down