Skip to content

[HUDI-7106] Fix sqs deletes, deltasync service close and error table default configs. #10117

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

Merged
bvaradar merged 2 commits into from
Nov 21, 2023
Merged

[HUDI-7106] Fix sqs deletes, deltasync service close and error table default configs. #10117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15b4a6e
Fix sqs delete and deltasync close
Nov 16, 2023
8ff6f25
Reverted close change
Nov 21, 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
12 changes: 8 additions & 4 deletions ...ilities/src/main/java/org/apache/hudi/utilities/sources/helpers/CloudObjectsSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,17 +200,21 @@ protected List<List<Message>> createListPartitions(List<Message> singleList, int
* Delete batch of messages from queue.
*/
protected void deleteBatchOfMessages(SqsClient sqs, String queueUrl, List<Message> messagesToBeDeleted) {
DeleteMessageBatchRequest deleteBatchReq =
DeleteMessageBatchRequest.builder().queueUrl(queueUrl).build();
List<DeleteMessageBatchRequestEntry> deleteEntries = new ArrayList<>(deleteBatchReq.entries());
if (messagesToBeDeleted.isEmpty()) {
return;
}
DeleteMessageBatchRequest.Builder builder = DeleteMessageBatchRequest.builder().queueUrl(queueUrl);
List<DeleteMessageBatchRequestEntry> deleteEntries = new ArrayList<>();

for (Message message : messagesToBeDeleted) {
deleteEntries.add(
DeleteMessageBatchRequestEntry.builder()
.id(message.messageId())
.receiptHandle(message.receiptHandle())
.build());
}
DeleteMessageBatchResponse deleteResponse = sqs.deleteMessageBatch(deleteBatchReq);
builder.entries(deleteEntries);
DeleteMessageBatchResponse deleteResponse = sqs.deleteMessageBatch(builder.build());
List<String> deleteFailures =
deleteResponse.failed().stream()
.map(BatchResultErrorEntry::id)
Expand Down
2 changes: 1 addition & 1 deletion hudi-utilities/src/main/java/org/apache/hudi/utilities/streamer/ErrorTableUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static Option<BaseErrorTableWriter> getErrorTableWriter(HoodieStreamer.Co

public static HoodieErrorTableConfig.ErrorWriteFailureStrategy getErrorWriteFailureStrategy(
TypedProperties props) {
String writeFailureStrategy = props.getString(ERROR_TABLE_WRITE_FAILURE_STRATEGY.key());
String writeFailureStrategy = props.getString(ERROR_TABLE_WRITE_FAILURE_STRATEGY.key(), ERROR_TABLE_WRITE_FAILURE_STRATEGY.defaultValue());
return HoodieErrorTableConfig.ErrorWriteFailureStrategy.valueOf(writeFailureStrategy);
}

Expand Down
5 changes: 2 additions & 3 deletions hudi-utilities/src/main/java/org/apache/hudi/utilities/streamer/StreamSync.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,11 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;

import scala.Tuple2;
import scala.collection.JavaConversions;
Expand Down Expand Up @@ -975,7 +974,7 @@ private String getSyncClassShortName(String syncClassName) {
}

public void runMetaSync() {
Set<String> syncClientToolClasses = new HashSet<>(Arrays.asList(cfg.syncClientToolClassNames.split(",")));
List<String> syncClientToolClasses = Arrays.stream(cfg.syncClientToolClassNames.split(",")).distinct().collect(Collectors.toList());
// for backward compatibility
if (cfg.enableHiveSync) {
cfg.enableMetaSync = true;
Expand Down