Skip to content

MINOR: remove spurious call to fatalFaultHandler #13651

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
showuon merged 1 commit into from
Apr 28, 2023
Merged

MINOR: remove spurious call to fatalFaultHandler #13651

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
19 changes: 12 additions & 7 deletions metadata/src/main/java/org/apache/kafka/controller/QuorumController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,10 +1181,6 @@ private void claim(int epoch) {
new CompleteActivationEvent(),
EnumSet.of(DOES_NOT_UPDATE_QUEUE_TIME, RUNS_IN_PREMIGRATION)
);
activationEvent.future.exceptionally(t -> {
fatalFaultHandler.handleFault("exception while activating controller", t);
return null;
});
queue.prepend(activationEvent);
} catch (Throwable e) {
fatalFaultHandler.handleFault("exception while claiming leadership", e);
Expand Down Expand Up @@ -1275,12 +1271,21 @@ public static List<ApiMessageAndVersion> generateActivationRecords(
}
return records;
}

class CompleteActivationEvent implements ControllerWriteOperation<Void> {
@Override
public ControllerResult<Void> generateRecordsAndResult() {
List<ApiMessageAndVersion> records = generateActivationRecords(log, logReplayTracker.empty(),
zkMigrationEnabled, bootstrapMetadata, featureControl);
return ControllerResult.atomicOf(records, null);
try {
List<ApiMessageAndVersion> records = generateActivationRecords(log,
logReplayTracker.empty(),
zkMigrationEnabled,
bootstrapMetadata,
featureControl);
return ControllerResult.atomicOf(records, null);
} catch (Throwable t) {
throw fatalFaultHandler.handleFault("exception while completing controller " +

@mumrah mumrah Apr 27, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think in most other places, we are not inside an event when we call the fault handler in QuorumController. I guess that doesn't matter since it calls Exit.halt synchronously?

@cmccabe cmccabe Apr 27, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's OK to halt from an event (or more generally to invoke fault handlers from that context)

"activation", t);
}
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion metadata/src/test/java/org/apache/kafka/controller/QuorumControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,7 +1359,7 @@ public void testBootstrapZkMigrationRecord() throws Exception {
assertEquals(
"The bootstrap metadata.version 3.3-IV0 does not support ZK migrations. Cannot continue with ZK migrations enabled.",
assertThrows(FaultHandlerException.class, () ->
checkBootstrapZkMigrationRecord(MetadataVersion.IBP_3_3_IV0, true)).getCause().getCause().getMessage()
checkBootstrapZkMigrationRecord(MetadataVersion.IBP_3_3_IV0, true)).getCause().getMessage()
);
}

Expand Down