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

Jump to bottom

Fix #6227 Async timeout dispatch race (#6228) #6231

Merged
merged 1 commit into from May 5, 2021
Merged

Fix #6227 Async timeout dispatch race (#6228) #6231

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
64 changes: 42 additions & 22 deletions jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
View file
Open in desktop
Expand Up @@ -147,6 +147,7 @@ public enum Action
private boolean _asyncWritePossible;
private long _timeoutMs = DEFAULT_TIMEOUT;
private AsyncContextEvent _event;
private Thread _onTimeoutThread;

protected HttpChannelState(HttpChannel channel)
{
Expand Down Expand Up @@ -573,7 +574,10 @@ public void dispatch(ServletContext context, String path)
switch (_requestState)
{
case ASYNC:
break;
case EXPIRING:
if (Thread.currentThread() != _onTimeoutThread)
throw new IllegalStateException(this.getStatusStringLocked());
break;
default:
throw new IllegalStateException(this.getStatusStringLocked());
Expand Down Expand Up @@ -637,39 +641,50 @@ protected void onTimeout()
throw new IllegalStateException(toStringLocked());
event = _event;
listeners = _asyncListeners;
_onTimeoutThread = Thread.currentThread();
}

if (listeners != null)
try
{
Runnable task = new Runnable()
if (listeners != null)
{
@Override
public void run()
Runnable task = new Runnable()
{
for (AsyncListener listener : listeners)
@Override
public void run()
{
try
for (AsyncListener listener : listeners)
{
listener.onTimeout(event);
}
catch (Throwable x)
{
if (LOG.isDebugEnabled())
LOG.warn("{} while invoking onTimeout listener {}", x.toString(), listener, x);
else
LOG.warn("{} while invoking onTimeout listener {}", x.toString(), listener);
try
{
listener.onTimeout(event);
}
catch (Throwable x)
{
if (LOG.isDebugEnabled())
LOG.warn("{} while invoking onTimeout listener {}", x.toString(), listener, x);
else
LOG.warn("{} while invoking onTimeout listener {}", x.toString(), listener);
}
}
}
}

@Override
public String toString()
{
return "onTimeout";
}
};
@Override
public String toString()
{
return "onTimeout";
}
};

runInContext(event, task);
runInContext(event, task);
}
}
finally
{
synchronized (this)
{
_onTimeoutThread = null;
}
}
}

Expand All @@ -686,6 +701,11 @@ public void complete()
switch (_requestState)
{
case EXPIRING:
if (Thread.currentThread() != _onTimeoutThread)
throw new IllegalStateException(this.getStatusStringLocked());
_requestState = _sendError ? RequestState.BLOCKING : RequestState.COMPLETE;
break;

case ASYNC:
_requestState = _sendError ? RequestState.BLOCKING : RequestState.COMPLETE;
break;
Expand Down
10 changes: 5 additions & 5 deletions jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java
View file
Open in desktop
Expand Up @@ -230,8 +230,8 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
}
catch (IllegalStateException x)
{
LOG.warn("Unable to resume suspended dispatch", x);
continue;
if (LOG.isDebugEnabled())
LOG.debug("dispatch failed", x);
}
}
}
Expand Down Expand Up @@ -356,12 +356,12 @@ public QoSAsyncListener(int priority)
}

@Override
public void onStartAsync(AsyncEvent event) throws IOException
public void onStartAsync(AsyncEvent event)
{
}

@Override
public void onComplete(AsyncEvent event) throws IOException
public void onComplete(AsyncEvent event)
{
}

Expand All @@ -377,7 +377,7 @@ public void onTimeout(AsyncEvent event) throws IOException
}

@Override
public void onError(AsyncEvent event) throws IOException
public void onError(AsyncEvent event)
{
}
}
Expand Down