Skip to content

MINOR: refactor error message of task migration #4803

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
guozhangwang merged 2 commits into from
Apr 2, 2018
Merged

MINOR: refactor error message of task migration #4803

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
ea8b319
refactor error message of task migration
guozhangwang Mar 30, 2018
e183148
fix unit tests
guozhangwang Mar 31, 2018
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
20 changes: 14 additions & 6 deletions streams/src/main/java/org/apache/kafka/streams/errors/TaskMigratedException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,35 @@ public class TaskMigratedException extends StreamsException {

private final Task task;

public TaskMigratedException(final Task task) {
this(task, null);
// this is for unit test only
public TaskMigratedException() {
super("A task has been migrated unexpectedly", null);

this.task = null;
}

public TaskMigratedException(final Task task,
final TopicPartition topicPartition,
final long endOffset,
final long pos) {
super(String.format("Log end offset of %s should not change while restoring: old end offset %d, current offset %d%n%s",
super(String.format("Log end offset of %s should not change while restoring: old end offset %d, current offset %d",
topicPartition,
endOffset,
pos,
task.toString("> ")),
pos),
null);

this.task = task;
}

public TaskMigratedException(final Task task) {
super(String.format("Task %s is unexpectedly closed during processing", task.id()), null);

this.task = task;
}

public TaskMigratedException(final Task task,
final Throwable throwable) {
super(task.toString(), throwable);
super(String.format("Client request for task %s has been fenced due to a rebalance", task.id()), throwable);

this.task = task;
}
Expand Down
8 changes: 4 additions & 4 deletions streams/src/main/java/org/apache/kafka/streams/processor/internals/StreamThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ private void addRecordsToTasks(final ConsumerRecords<byte[], byte[]> records) {
final StreamTask task = taskManager.activeTask(partition);

if (task.isClosed()) {
log.warn("Stream task {} is already closed, probably because it got unexpectedly migrated to another thread already. " +
log.info("Stream task {} is already closed, probably because it got unexpectedly migrated to another thread already. " +
"Notifying the thread to trigger a new rebalance immediately.", task.id());
throw new TaskMigratedException(task);
}
Expand Down Expand Up @@ -1032,7 +1032,7 @@ private void maybeUpdateStandbyTasks(final long now) {
final StandbyTask task = taskManager.standbyTask(partition);

if (task.isClosed()) {
log.warn("Standby task {} is already closed, probably because it got unexpectly migrated to another thread already. " +
log.info("Standby task {} is already closed, probably because it got unexpectedly migrated to another thread already. " +
"Notifying the thread to trigger a new rebalance immediately.", task.id());
throw new TaskMigratedException(task);
}
Expand Down Expand Up @@ -1065,7 +1065,7 @@ private void maybeUpdateStandbyTasks(final long now) {
}

if (task.isClosed()) {
log.warn("Standby task {} is already closed, probably because it got unexpectedly migrated to another thread already. " +
log.info("Standby task {} is already closed, probably because it got unexpectedly migrated to another thread already. " +
"Notifying the thread to trigger a new rebalance immediately.", task.id());
throw new TaskMigratedException(task);
}
Expand All @@ -1084,7 +1084,7 @@ private void maybeUpdateStandbyTasks(final long now) {
final StandbyTask task = taskManager.standbyTask(partition);

if (task.isClosed()) {
log.warn("Standby task {} is already closed, probably because it got unexpectly migrated to another thread already. " +
log.info("Standby task {} is already closed, probably because it got unexpectedly migrated to another thread already. " +
"Notifying the thread to trigger a new rebalance immediately.", task.id());
throw new TaskMigratedException(task);
}
Expand Down
14 changes: 7 additions & 7 deletions .../src/test/java/org/apache/kafka/streams/processor/internals/AssignedStreamsTasksTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public void shouldCloseTaskOnSuspendWhenRuntimeException() {
public void shouldCloseTaskOnSuspendIfTaskMigratedException() {
mockTaskInitialization();
t1.suspend();
EasyMock.expectLastCall().andThrow(new TaskMigratedException(t1));
EasyMock.expectLastCall().andThrow(new TaskMigratedException());
t1.close(false, true);
EasyMock.expectLastCall();
EasyMock.replay(t1);
Expand Down Expand Up @@ -226,7 +226,7 @@ public void shouldCloseTaskOnResumeSuspendedIfTaskMigratedException() {
mockRunningTaskSuspension();
t1.resume();
t1.initializeTopology();
EasyMock.expectLastCall().andThrow(new TaskMigratedException(t1));
EasyMock.expectLastCall().andThrow(new TaskMigratedException());
t1.close(false, true);
EasyMock.expectLastCall();
EasyMock.replay(t1);
Expand Down Expand Up @@ -267,7 +267,7 @@ public void shouldCommitRunningTasks() {
public void shouldCloseTaskOnCommitIfTaskMigratedException() {
mockTaskInitialization();
t1.commit();
EasyMock.expectLastCall().andThrow(new TaskMigratedException(t1));
EasyMock.expectLastCall().andThrow(new TaskMigratedException());
t1.close(false, true);
EasyMock.expectLastCall();
EasyMock.replay(t1);
Expand Down Expand Up @@ -319,7 +319,7 @@ public void shouldCloseTaskOnMaybeCommitIfTaskMigratedException() {
mockTaskInitialization();
EasyMock.expect(t1.commitNeeded()).andReturn(true);
t1.commit();
EasyMock.expectLastCall().andThrow(new TaskMigratedException(t1));
EasyMock.expectLastCall().andThrow(new TaskMigratedException());
t1.close(false, true);
EasyMock.expectLastCall();
EasyMock.replay(t1);
Expand All @@ -338,7 +338,7 @@ public void shouldCloseTaskOnMaybeCommitIfTaskMigratedException() {
public void shouldCloseTaskOnProcessesIfTaskMigratedException() {
mockTaskInitialization();
t1.process();
EasyMock.expectLastCall().andThrow(new TaskMigratedException(t1));
EasyMock.expectLastCall().andThrow(new TaskMigratedException());
t1.close(false, true);
EasyMock.expectLastCall();
EasyMock.replay(t1);
Expand Down Expand Up @@ -370,7 +370,7 @@ public void shouldPunctuateRunningTasks() {
public void shouldCloseTaskOnMaybePunctuateStreamTimeIfTaskMigratedException() {
mockTaskInitialization();
t1.maybePunctuateStreamTime();
EasyMock.expectLastCall().andThrow(new TaskMigratedException(t1));
EasyMock.expectLastCall().andThrow(new TaskMigratedException());
t1.close(false, true);
EasyMock.expectLastCall();
EasyMock.replay(t1);
Expand All @@ -390,7 +390,7 @@ public void shouldCloseTaskOnMaybePunctuateSystemTimeIfTaskMigratedException() {
mockTaskInitialization();
EasyMock.expect(t1.maybePunctuateStreamTime()).andReturn(true);
t1.maybePunctuateSystemTime();
EasyMock.expectLastCall().andThrow(new TaskMigratedException(t1));
EasyMock.expectLastCall().andThrow(new TaskMigratedException());
t1.close(false, true);
EasyMock.expectLastCall();
EasyMock.replay(t1);
Expand Down