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

[cdc-runtime] Setup waitFlushSuccess before responding operator to flush #2805

Merged
merged 1 commit into from
Dec 4, 2023
Merged

[cdc-runtime] Setup waitFlushSuccess before responding operator to flush #2805

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .../com/ververica/cdc/runtime/operators/schema/coordinator/SchemaRegistryRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ public CompletableFuture<CoordinationResponse> handleSchemaChangeRequest(
CompletableFuture<CoordinationResponse> response =
CompletableFuture.completedFuture(wrap(new SchemaChangeResponse(true)));
schemaManager.applySchemaChange(request.getSchemaChangeEvent());
pendingSchemaChanges.add(new PendingSchemaChange(request, response));
this.waitFlushSuccess =
new PendingSchemaChange(request, response).startToWaitForFlushSuccess();
return response;
} else {
LOG.info("There are already processing requests. Wait for processing.");
Expand All @@ -116,7 +117,6 @@ public CompletableFuture<CoordinationResponse> handleSchemaChangeRequest(

/** Handle the {@link ReleaseUpstreamRequest} and wait for all sink subtasks flushing. */
public CompletableFuture<CoordinationResponse> handleReleaseUpstreamRequest() {
this.waitFlushSuccess = pendingSchemaChanges.remove(0).startToWaitForFlushSuccess();
return waitFlushSuccess.getResponseFuture();
}

Expand Down Expand Up @@ -152,19 +152,19 @@ private void startNextSchemaChangeRequest() {
flushedSinkWriters.clear();
waitFlushSuccess = null;
while (!pendingSchemaChanges.isEmpty()) {
PendingSchemaChange pendingSchemaChange = pendingSchemaChanges.get(0);
PendingSchemaChange pendingSchemaChange = pendingSchemaChanges.remove(0);
SchemaChangeRequest request = pendingSchemaChange.changeRequest;
if (request.getSchemaChangeEvent() instanceof CreateTableEvent
&& schemaManager.schemaExists(request.getTableId())) {
pendingSchemaChange
.getResponseFuture()
.complete(wrap(new SchemaChangeResponse(false)));
pendingSchemaChanges.remove(0);
} else {
schemaManager.applySchemaChange(request.getSchemaChangeEvent());
pendingSchemaChange
.getResponseFuture()
.complete(wrap(new SchemaChangeResponse(true)));
this.waitFlushSuccess = pendingSchemaChange.startToWaitForFlushSuccess();
break;
}
}
Expand Down