Skip to content

Cancel pending TLS handshake task when streams closed in both directions #1497

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
jfallows merged 1 commit into from
Jun 14, 2025
Merged

Cancel pending TLS handshake task when streams closed in both directions #1497

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
17 changes: 17 additions & 0 deletions ...src/main/java/io/aklivity/zilla/runtime/binding/tls/internal/stream/TlsClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,6 +1529,8 @@ private void onNetEnd(
doAppReset(traceId);
doEncodeCloseOutbound(traceId, budgetId);
doNetEnd(traceId);

cancelHandshakeTask();
}

decoder = decodeIgnoreAll;
Expand Down Expand Up @@ -1565,6 +1567,8 @@ private void onNetAbort(
doAppReset(traceId);

doNetAbort(traceId);

cancelHandshakeTask();
}

private void onNetReset(
Expand All @@ -1589,6 +1593,8 @@ private void onNetReset(
doAppAbort(traceId);

doNetReset(traceId);

cancelHandshakeTask();
}

private void onNetWindow(
Expand Down Expand Up @@ -2194,6 +2200,17 @@ private void cleanupEncodeSlot()
}
}

private void cancelHandshakeTask()
{
assert TlsState.closed(state);

if (handshakeTaskFutureId != NO_CANCEL_ID)
{
signaler.cancel(handshakeTaskFutureId);
handshakeTaskFutureId = NO_CANCEL_ID;
}
}

private void cancelHandshakeTimeout()
{
if (handshakeTimeoutFutureId != NO_CANCEL_ID)
Expand Down
17 changes: 17 additions & 0 deletions ...src/main/java/io/aklivity/zilla/runtime/binding/tls/internal/stream/TlsServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,6 +1233,8 @@ private void onNetEnd(
{
doEncodeCloseOutbound(traceId, budgetId);
doNetEnd(traceId);

cancelHandshakeTask();
}

decoder = decodeIgnoreAll;
Expand Down Expand Up @@ -1268,6 +1270,8 @@ private void onNetAbort(
stream.ifPresent(s -> s.doAppReset(traceId));

doNetAbort(traceId);

cancelHandshakeTask();
}

private void onNetReset(
Expand All @@ -1292,6 +1296,8 @@ private void onNetReset(
stream.ifPresent(s -> s.doAppAbort(traceId));

doNetReset(traceId);

cancelHandshakeTask();
}

private void onNetWindow(
Expand Down Expand Up @@ -1841,6 +1847,17 @@ private void cleanupEncodeSlot()
}
}

private void cancelHandshakeTask()
{
assert TlsState.closed(state);

if (handshakeTaskFutureId != NO_CANCEL_ID)
{
signaler.cancel(handshakeTaskFutureId);
handshakeTaskFutureId = NO_CANCEL_ID;
}
}

private void cancelHandshakeTimeout()
{
if (handshakeTimeoutFutureId != NO_CANCEL_ID)
Expand Down
Loading