Skip to content

HTTPCORE-774: fixed a race condition caused by concurrent update of the connection input window to the max value #511

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
ok2c merged 2 commits into from
Jan 4, 2025
Merged

HTTPCORE-774: fixed a race condition caused by concurrent update of the connection input window to the max value #511

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8ca4a1
HTTPCORE-774: fixed a race condition caused by concurrent update of t…
ok2c Jan 3, 2025
8e168c8
HTTPCORE-774: update window management improvements
ok2c Jan 3, 2025
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
24 changes: 16 additions & 8 deletions ...ore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/AbstractH2StreamMultiplexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ public String getId() {

abstract H2StreamHandler createRemotelyInitiatedStream(
H2StreamChannel channel,

HttpProcessor httpProcessor,
BasicHttpConnectionMetrics connMetrics,
HandlerFactory<AsyncPushConsumer> pushHandlerFactory) throws IOException;
Expand All @@ -211,6 +212,15 @@ private int updateWindow(final AtomicInteger window, final int delta) throws Ari
}
}

private int updateWindowMax(final AtomicInteger window) throws ArithmeticException {
for (;;) {
final int current = window.get();
if (window.compareAndSet(current, Integer.MAX_VALUE)) {
return Integer.MAX_VALUE - current;
}
}
}

private int updateInputWindow(
final int streamId, final AtomicInteger window, final int delta) throws ArithmeticException {
final int newSize = updateWindow(window, delta);
Expand Down Expand Up @@ -371,9 +381,9 @@ private void incrementInputCapacity(
final int remainingCapacity = Integer.MAX_VALUE - streamWinSize;
final int chunk = Math.min(inputCapacity, remainingCapacity);
if (chunk != 0) {
updateInputWindow(streamId, inputWindow, chunk);
final RawFrame windowUpdateFrame = frameFactory.createWindowUpdate(streamId, chunk);
commitFrame(windowUpdateFrame);
updateInputWindow(streamId, inputWindow, chunk);
}
}
}
Expand Down Expand Up @@ -412,7 +422,7 @@ public final void onConnect() throws HttpException, IOException {

commitFrame(settingsFrame);
localSettingState = SettingsHandshake.TRANSMITTED;
maximizeConnWindow(connInputWindow.get());
maximizeWindow(0, connInputWindow);

if (streamListener != null) {
final int initInputWindow = connInputWindow.get();
Expand Down Expand Up @@ -1024,7 +1034,7 @@ private void consumeDataFrame(final RawFrame frame, final H2Stream stream) throw
}
final int connWinSize = updateInputWindow(0, connInputWindow, -frameLength);
if (connWinSize < CONNECTION_WINDOW_LOW_MARK) {
maximizeConnWindow(connWinSize);
maximizeWindow(0, connInputWindow);
}
}
if (stream.isRemoteClosed()) {
Expand All @@ -1039,12 +1049,11 @@ private void consumeDataFrame(final RawFrame frame, final H2Stream stream) throw
stream.consumeData(payload);
}

private void maximizeConnWindow(final int connWinSize) throws IOException {
final int delta = Integer.MAX_VALUE - connWinSize;
private void maximizeWindow(final int streamId, final AtomicInteger window) throws IOException {
final int delta = updateWindowMax(window);
if (delta > 0) {
final RawFrame windowUpdateFrame = frameFactory.createWindowUpdate(0, delta);
final RawFrame windowUpdateFrame = frameFactory.createWindowUpdate(streamId, delta);
commitFrame(windowUpdateFrame);
updateInputWindow(0, connInputWindow, delta);
}
}

Expand Down Expand Up @@ -1441,7 +1450,6 @@ public void update(final int increment) throws IOException {
if (remoteEndStream) {
return;
}
incrementInputCapacity(0, connInputWindow, increment);
incrementInputCapacity(id, inputWindow, increment);
}

Expand Down
Loading