root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

KAFKA-14178 Don't record queue time for deferred events (#12551)

This commit is contained in:
David Arthur 2022-08-24 10:01:48 -04:00 committed by GitHub
parent 4170e74295
commit 5eff8592cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
metadata/src/main/java/org/apache/kafka/controller/QuorumController.java
View File

@ -709,13 +709,19 @@ public final class QuorumController implements Controller {
private final CompletableFuture<T> future; private final CompletableFuture<T> future;
private final ControllerWriteOperation<T> op; private final ControllerWriteOperation<T> op;
private final long eventCreatedTimeNs = time.nanoseconds(); private final long eventCreatedTimeNs = time.nanoseconds();
private final boolean deferred;
private OptionalLong startProcessingTimeNs = OptionalLong.empty(); private OptionalLong startProcessingTimeNs = OptionalLong.empty();
private ControllerResultAndOffset<T> resultAndOffset; private ControllerResultAndOffset<T> resultAndOffset;
ControllerWriteEvent(String name, ControllerWriteOperation<T> op) { ControllerWriteEvent(String name, ControllerWriteOperation<T> op) {
this(name, op, false);
}
ControllerWriteEvent(String name, ControllerWriteOperation<T> op, boolean deferred) {
this.name = name; this.name = name;
this.future = new CompletableFuture<T>(); this.future = new CompletableFuture<T>();
this.op = op; this.op = op;
this.deferred = deferred;
this.resultAndOffset = null; this.resultAndOffset = null;
} }
@ -726,7 +732,11 @@ public final class QuorumController implements Controller {
@Override @Override
public void run() throws Exception { public void run() throws Exception {
long now = time.nanoseconds(); long now = time.nanoseconds();
controllerMetrics.updateEventQueueTime(NANOSECONDS.toMillis(now - eventCreatedTimeNs)); if (!deferred) {
// We exclude deferred events from the event queue time metric to prevent
// incorrectly including the deferral time in the queue time.
controllerMetrics.updateEventQueueTime(NANOSECONDS.toMillis(now - eventCreatedTimeNs));
}
int controllerEpoch = curClaimEpoch; int controllerEpoch = curClaimEpoch;
if (!isActiveController()) { if (!isActiveController()) {
throw newNotControllerException(); throw newNotControllerException();
@ -1163,7 +1173,7 @@ public final class QuorumController implements Controller {
private <T> void scheduleDeferredWriteEvent(String name, long deadlineNs, private <T> void scheduleDeferredWriteEvent(String name, long deadlineNs,
ControllerWriteOperation<T> op) { ControllerWriteOperation<T> op) {
ControllerWriteEvent<T> event = new ControllerWriteEvent<>(name, op); ControllerWriteEvent<T> event = new ControllerWriteEvent<>(name, op, true);
queue.scheduleDeferred(name, new EarliestDeadlineFunction(deadlineNs), event); queue.scheduleDeferred(name, new EarliestDeadlineFunction(deadlineNs), event);
event.future.exceptionally(e -> { event.future.exceptionally(e -> {
if (e instanceof UnknownServerException && e.getCause() != null && if (e instanceof UnknownServerException && e.getCause() != null &&
@ -1236,7 +1246,7 @@ public final class QuorumController implements Controller {
// generated by a ControllerWriteEvent have been applied. // generated by a ControllerWriteEvent have been applied.
return result; return result;
}); }, true);
long delayNs = time.nanoseconds(); long delayNs = time.nanoseconds();
if (imbalancedScheduled == ImbalanceSchedule.DEFERRED) { if (imbalancedScheduled == ImbalanceSchedule.DEFERRED) {
@ -1281,7 +1291,7 @@ public final class QuorumController implements Controller {
Arrays.asList(new ApiMessageAndVersion(new NoOpRecord(), (short) 0)), Arrays.asList(new ApiMessageAndVersion(new NoOpRecord(), (short) 0)),
null null
); );
}); }, true);
long delayNs = time.nanoseconds() + maxIdleIntervalNs.getAsLong(); long delayNs = time.nanoseconds() + maxIdleIntervalNs.getAsLong();
queue.scheduleDeferred(WRITE_NO_OP_RECORD, new EarliestDeadlineFunction(delayNs), event); queue.scheduleDeferred(WRITE_NO_OP_RECORD, new EarliestDeadlineFunction(delayNs), event);