Skip to content
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

Add suppressed failures in Callback failed #11435

Merged
merged 7 commits into from
Feb 29, 2024
Merged

Add suppressed failures in Callback failed #11435

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
846726a
Add suppressed failures in failed
gregw Feb 22, 2024
cb1217a
Merge branch 'jetty-12.0.x' into fix/jetty-12.0.x/11431/addSuppressed…
gregw Feb 26, 2024
4e59738
Merge branch 'jetty-12.0.x' into fix/jetty-12.0.x/11431/addSuppressed…
gregw Feb 27, 2024
50da683
Fixed typos in Callback
gregw Feb 27, 2024
bf9e312
updates from review
gregw Feb 28, 2024
c80efe3
Merge branch 'jetty-12.0.x' into fix/jetty-12.0.x/11431/addSuppressed…
gregw Feb 29, 2024
01a1a09
Update from review
gregw Feb 29, 2024
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
89 changes: 52 additions & 37 deletions ...y-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,7 +1114,7 @@ private Runnable lockedFailWrite(Throwable x, boolean fatal)
}
if (writeCallback == null)
return null;
return () -> writeCallback.failed(x);
return () -> Callback.failed(writeCallback, x);
}

public long getContentBytesWritten()
Expand Down Expand Up @@ -1229,7 +1229,7 @@ else if (last && !(totalWritten == 0 && HttpMethod.HEAD.is(_request.getMethod())
if (writeFailure != null)
{
Throwable failure = writeFailure;
httpChannelState._writeInvoker.run(() -> callback.failed(failure));
httpChannelState._writeInvoker.run(() -> Callback.failed(callback, failure));
return;
}

Expand Down Expand Up @@ -1297,7 +1297,7 @@ public void failed(Throwable x)
httpChannel.lockedStreamSendCompleted(false);
}
if (callback != null)
httpChannel._writeInvoker.run(() -> callback.failed(x));
httpChannel._writeInvoker.run(() -> Callback.failed(callback, x));
}

@Override
Expand Down Expand Up @@ -1513,41 +1513,49 @@ else if (LOG.isDebugEnabled())
@Override
public void failed(Throwable failure)
{
// Called when the request/response cycle is completing with a failure.
HttpStream stream;
ChannelRequest request;
HttpChannelState httpChannelState;
ErrorResponse errorResponse = null;
try (AutoLock ignored = _request._lock.lock())
try
{
if (lockedCompleteCallback())
return;
httpChannelState = _request._httpChannelState;
stream = httpChannelState._stream;
request = _request;
// Called when the request/response cycle is completing with a failure.
HttpStream stream;
ChannelRequest request;
HttpChannelState httpChannelState;
ErrorResponse errorResponse = null;
try (AutoLock ignored = _request._lock.lock())
{
if (lockedCompleteCallback())
return;
httpChannelState = _request._httpChannelState;
stream = httpChannelState._stream;
request = _request;

assert httpChannelState._callbackFailure == null;
assert httpChannelState._callbackFailure == null;

httpChannelState._callbackFailure = failure;
httpChannelState._callbackFailure = failure;

// Consume any input.
Throwable unconsumed = stream.consumeAvailable();
ExceptionUtil.addSuppressedIfNotAssociated(failure, unconsumed);
// Consume any input.
Throwable unconsumed = stream.consumeAvailable();
ExceptionUtil.addSuppressedIfNotAssociated(failure, unconsumed);

ChannelResponse response = httpChannelState._response;
if (LOG.isDebugEnabled())
LOG.debug("failed stream.isCommitted={}, response.isCommitted={} {}", stream.isCommitted(), response.isCommitted(), this);
ChannelResponse response = httpChannelState._response;
if (LOG.isDebugEnabled())
LOG.debug("failed stream.isCommitted={}, response.isCommitted={} {}", stream.isCommitted(), response.isCommitted(), this);

// There may have been an attempt to write an error response that failed.
// Do not try to write again an error response if already committed.
if (!stream.isCommitted())
errorResponse = new ErrorResponse(request);
}
// There may have been an attempt to write an error response that failed.
// Do not try to write again an error response if already committed.
if (!stream.isCommitted())
errorResponse = new ErrorResponse(request);
}

if (errorResponse != null)
Response.writeError(request, errorResponse, new ErrorCallback(request, errorResponse, stream, failure), failure);
else
_request.getHttpChannelState()._handlerInvoker.failed(failure);
if (errorResponse != null)
Response.writeError(request, errorResponse, new ErrorCallback(request, errorResponse, stream, failure), failure);
else
_request.getHttpChannelState()._handlerInvoker.failed(failure);
}
catch (Throwable t)
{
ExceptionUtil.addSuppressedIfNotAssociated(t, failure);
throw t;
}
}

private boolean lockedCompleteCallback()
Expand Down Expand Up @@ -1683,7 +1691,7 @@ public void succeeded()
}
else
{
httpChannelState._handlerInvoker.failed(failure);
Callback.failed(httpChannelState._handlerInvoker, failure);
}
}

Expand All @@ -1705,9 +1713,8 @@ public void failed(Throwable x)
httpChannelState = _request.lockedGetHttpChannelState();
httpChannelState._response._status = _errorResponse._status;
}
if (ExceptionUtil.areNotAssociated(failure, x))
failure.addSuppressed(x);
httpChannelState._handlerInvoker.failed(failure);
ExceptionUtil.addSuppressedIfNotAssociated(failure, x);
Callback.failed(httpChannelState._handlerInvoker, failure);
}

@Override
Expand Down Expand Up @@ -1736,8 +1743,16 @@ public void succeeded()
@Override
public void failed(Throwable x)
{
completing();
super.failed(x);
try
{
completing();
super.failed(x);
}
catch (Throwable t)
{
ExceptionUtil.addSuppressedIfNotAssociated(t, x);
throw t;
}
}

private void completing()
Expand Down
106 changes: 88 additions & 18 deletions jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Callback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,15 @@ public void succeeded()
@Override
public void failed(Throwable x)
{
completable.completeExceptionally(x);
try
{
completable.completeExceptionally(x);
}
catch (Throwable t)
{
ExceptionUtil.addSuppressedIfNotAssociated(t, x);
throw t;
}
}

@Override
Expand Down Expand Up @@ -165,7 +173,15 @@ public void succeeded()
@Override
public void failed(Throwable x)
{
failure.accept(x);
try
{
failure.accept(x);
}
catch (Throwable t)
{
ExceptionUtil.addSuppressedIfNotAssociated(t, x);
throw t;
}
}

@Override
Expand Down Expand Up @@ -276,10 +292,19 @@ public void failed(Throwable x)
{
callback.failed(x);
}
finally
catch (Throwable t)
{
ExceptionUtil.addSuppressedIfNotAssociated(x, t);
}
try
{
completed.accept(x);
}
catch (Throwable t)
{
ExceptionUtil.addSuppressedIfNotAssociated(t, x);
throw t;
}
}
};
}
Expand All @@ -302,13 +327,14 @@ public void succeeded()
{
try
{
completed.run();
callback.succeeded();
completed.run();
}
catch (Throwable t)
{
callback.failed(t);
Callback.failed(callback, t);
}
callback.succeeded();
gregw marked this conversation as resolved.
Show resolved Hide resolved
}

@Override
Expand All @@ -320,9 +346,9 @@ public void failed(Throwable x)
}
catch (Throwable t)
{
x.addSuppressed(t);
ExceptionUtil.addSuppressedIfNotAssociated(x, t);
}
callback.failed(x);
Callback.failed(callback, x);
}
};
}
Expand All @@ -337,6 +363,7 @@ public void failed(Throwable x)
*/
static Callback from(Callback callback, Throwable cause)
{
callback.succeeded();
return new Callback()
{
@Override
Expand All @@ -348,8 +375,16 @@ public void succeeded()
@Override
public void failed(Throwable x)
{
cause.addSuppressed(x);
callback.failed(cause);
try
{
cause.addSuppressed(x);
callback.failed(cause);
}
catch (Throwable t)
{
ExceptionUtil.addSuppressedIfNotAssociated(t, x);
throw t;
}
}
};
}
Expand Down Expand Up @@ -381,7 +416,15 @@ default void succeeded()
@Override
default void failed(Throwable x)
{
completed();
try
{
completed();
}
catch (Throwable t)
{
ExceptionUtil.addSuppressedIfNotAssociated(t, x);
throw t;
}
}
}

Expand Down Expand Up @@ -426,11 +469,19 @@ public void failed(Throwable x)
{
try
{
callback.failed(x);
try
{
callback.failed(x);
}
finally
{
completed();
}
}
finally
catch (Throwable t)
Copy link
Contributor

Choose a reason for hiding this comment

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

Please use same style as line 295.

{
completed();
ExceptionUtil.addSuppressedIfNotAssociated(t, x);
throw t;
}
}

Expand Down Expand Up @@ -480,10 +531,8 @@ public void failed(Throwable x)
{
ExceptionUtil.addSuppressedIfNotAssociated(x, t);
}
finally
{
cb2.failed(x);
}

Callback.failed(cb2, x);
Copy link
Contributor

Choose a reason for hiding this comment

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

Put this back inside a finally.

}

@Override
Expand Down Expand Up @@ -533,7 +582,7 @@ public void succeeded()
@Override
public void failed(Throwable x)
{
callback.failed(x);
Callback.failed(callback, x);
super.failed(x);
Copy link
Contributor

Choose a reason for hiding this comment

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

Change this to have super.failed() inside a finally, so it gets called in all cases.

}
};
Expand Down Expand Up @@ -592,4 +641,25 @@ public Completable compose(Consumer<Completable> consumer)
return completable;
}
}

/**
* Invoke a callback failure, handling any {@link Throwable} thrown
* by adding the passed {@code failure} as a suppressed with
* {@link ExceptionUtil#addSuppressedIfNotAssociated(Throwable, Throwable)}.
* @param callback The callback to fail
* @param failure The failure
* @throws RuntimeException If thrown, will have the {@code failure} added as a suppressed.
*/
static void failed(Callback callback, Throwable failure)
gregw marked this conversation as resolved.
Show resolved Hide resolved
{
try
{
callback.failed(failure);
}
catch (Throwable t)
{
ExceptionUtil.addSuppressedIfNotAssociated(t, failure);
throw t;
lorban marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
21 changes: 15 additions & 6 deletions ...-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,15 +499,24 @@ public void handle()
ExceptionUtil.addSuppressedIfNotAssociated(cause, x);
if (LOG.isDebugEnabled())
LOG.debug("Could not perform error handling, aborting", cause);
if (_state.isResponseCommitted())

try
{
// Perform the same behavior as when the callback is failed.
_state.errorHandlingComplete(cause);
if (_state.isResponseCommitted())
{
// Perform the same behavior as when the callback is failed.
_state.errorHandlingComplete(cause);
}
else
{
getServletContextResponse().resetContent();
sendErrorResponseAndComplete();
}
}
else
catch (Throwable t)
{
getServletContextResponse().resetContent();
sendErrorResponseAndComplete();
ExceptionUtil.addSuppressedIfNotAssociated(t, cause);
throw t;
}
}
finally
Expand Down
Loading