Skip to content

KAFKA-3225 Added test case for missing commit call on WorkerSourceTas… #84

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

Closed
Jeremy Custenborder (jcustenborder) wants to merge 1 commit into from
Closed

KAFKA-3225 Added test case for missing commit call on WorkerSourceTas… #84

Show file tree
Hide file tree
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
15 changes: 15 additions & 0 deletions connect/runtime/src/main/java/org/apache/kafka/connect/runtime/WorkerSourceTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,8 @@ public boolean commitOffsets() {
finishSuccessfulFlush();
log.debug("Finished {} offset commitOffsets successfully in {} ms",
this, time.milliseconds() - started);

commitSourceTask();
return true;
}
}
Expand Down Expand Up @@ -334,9 +336,22 @@ public void onCompletion(Throwable error, Void result) {
finishSuccessfulFlush();
log.info("Finished {} commitOffsets successfully in {} ms",
this, time.milliseconds() - started);

commitSourceTask();

return true;
}

private void commitSourceTask() {
try {
this.task.commit();
} catch (InterruptedException ex) {
log.warn("Commit interrupted", ex);
} catch (Throwable ex) {
log.error("Exception thrown while calling task.commit()", ex);
}
}

private synchronized void finishFailedFlush() {
offsetWriter.cancelFlush();
outstandingMessages.putAll(outstandingMessagesBacklog);
Expand Down
2 changes: 2 additions & 0 deletions connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerSourceTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ public void testCommit() throws Exception {
final CountDownLatch pollLatch = expectPolls(1);
expectOffsetFlush(true);

sourceTask.commit();
EasyMock.expectLastCall();
sourceTask.stop();
EasyMock.expectLastCall();
expectOffsetFlush(true);
Expand Down