Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a reentrancy issue that caused a stack overflow. 

The case was that shutdown was called, ShutdownFlusherEntry called
flusher.close(), which called super.close(), which called
onCompleteFailure(), which looped over the active items to fail them,
calling again ShutdownFlusherEntry, which called again flusher.close(),
etc.
This commit is contained in:
Simone Bordet 2014-08-02 00:01:56 +02:00
parent 9a85f4cea6
commit dcc8bfcd10
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java
View File

@ -588,11 +588,13 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
private final ByteBufferPool.Lease lease = new ByteBufferPool.Lease(generator.getByteBufferPool());
private final int maxGather;
private final List<FlusherEntry> active;
private final Queue<FlusherEntry> complete;
private Flusher(int maxGather)
{
this.maxGather = maxGather;
this.active = new ArrayList<>(maxGather);
this.complete = new ArrayDeque<>(maxGather);
}
private void append(FlusherEntry entry)
@ -731,12 +733,19 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
public void succeeded()
{
lease.recycle();
// Transfer active items to avoid reentrancy.
for (int i = 0; i < active.size(); ++i)
complete.add(active.get(i));
active.clear();
// Drain the queue one by one to avoid reentrancy.
while (!complete.isEmpty())
{
FlusherEntry entry = active.get(i);
FlusherEntry entry = complete.poll();
entry.succeeded();
}
active.clear();
super.succeeded();
}
@ -749,31 +758,40 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
@Override
protected void onCompleteFailure(Throwable x)
{
LOG.debug(x);
if (LOG.isDebugEnabled())
LOG.debug(x);
lease.recycle();
// Transfer active items to avoid reentrancy.
for (int i = 0; i < active.size(); ++i)
complete.add(active.get(i));
active.clear();
// Drain the queue one by one to avoid reentrancy.
while (!complete.isEmpty())
{
FlusherEntry entry = active.get(i);
FlusherEntry entry = complete.poll();
entry.failed(x);
}
active.clear();
}
public void close()
{
super.close();
Queue<FlusherEntry> queued;
synchronized (queue)
{
super.close();
queued = new ArrayDeque<>(queue);
queue.clear();
}
if (LOG.isDebugEnabled())
LOG.debug("Closing, queued={}", queued.size());
for (FlusherEntry item: queued)
for (FlusherEntry item : queued)
closed(item);
}
protected void closed(FlusherEntry item)