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

Merge pull request #5517 from eclipse/jetty-10.0.x-5493-StatisticsHandler 

Issue #5493 - Fix and simplify graceful shutdown of StatisticsHandler
This commit is contained in:
Lachlan 2020-10-29 08:55:22 +11:00 committed by GitHub
parent 1ad6ebabb6 d6751c9936
commit 5bb47c954c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java
View File

@ -48,7 +48,7 @@ public class StatisticsHandler extends HandlerWrapper implements Graceful
{
private static final Logger LOG = LoggerFactory.getLogger(StatisticsHandler.class);
private final AtomicLong _statsStartedAt = new AtomicLong();
private volatile Shutdown _shutdown;
private final Shutdown _shutdown;
private final CounterStatistic _requestStats = new CounterStatistic();
private final SampleStatistic _requestTimeStats = new SampleStatistic();
@ -92,27 +92,33 @@ public class StatisticsHandler extends HandlerWrapper implements Graceful
@Override
public void onComplete(AsyncEvent event)
{
HttpChannelState state = ((AsyncContextEvent)event).getHttpChannelState();
Request request = state.getBaseRequest();
final long elapsed = System.currentTimeMillis() - request.getTimeStamp();
long numRequests = _requestStats.decrement();
Request request = ((AsyncContextEvent)event).getHttpChannelState().getBaseRequest();
long elapsed = System.currentTimeMillis() - request.getTimeStamp();
_requestStats.decrement();
_requestTimeStats.record(elapsed);
updateResponse(request);
_asyncWaitStats.decrement();
if (numRequests == 0 && _gracefulShutdownWaitsForRequests)
{
Shutdown shutdown = _shutdown;
if (shutdown != null)
shutdown.check();
}
if (_shutdown.isShutdown())
_shutdown.check();
}
};
public StatisticsHandler()
{
_shutdown = new Shutdown(this)
{
@Override
public boolean isShutdownDone()
{
if (_gracefulShutdownWaitsForRequests)
return _requestStats.getCurrent() == 0;
else
return _dispatchedStats.getCurrent() == 0;
}
};
}
/**
* Resets the current request statistics.
*/
@ -174,8 +180,7 @@ public class StatisticsHandler extends HandlerWrapper implements Graceful
final long now = System.currentTimeMillis();
final long dispatched = now - start;
long numRequests = -1;
long numDispatches = _dispatchedStats.decrement();
_dispatchedStats.decrement();
_dispatchedTimeStats.record(dispatched);
if (state.isInitial())
@ -187,19 +192,14 @@ public class StatisticsHandler extends HandlerWrapper implements Graceful
}
else
{
numRequests = _requestStats.decrement();
_requestStats.decrement();
_requestTimeStats.record(dispatched);
updateResponse(baseRequest);
}
}
Shutdown shutdown = _shutdown;
if (shutdown != null)
{
response.flushBuffer();
if (_gracefulShutdownWaitsForRequests ? (numRequests == 0) : (numDispatches == 0))
shutdown.check();
}
if (_shutdown.isShutdown())
_shutdown.check();
}
}
@ -230,8 +230,11 @@ public class StatisticsHandler extends HandlerWrapper implements Graceful
}
}
else
{
// will fall through to not found handler
_responses4xx.increment();
}
_responsesTotalBytes.add(response.getContentCount());
}
@ -240,17 +243,7 @@ public class StatisticsHandler extends HandlerWrapper implements Graceful
{
if (getHandler() == null)
throw new IllegalStateException("StatisticsHandler has no Wrapped Handler");
_shutdown = new Shutdown(this)
{
@Override
public boolean isShutdownDone()
{
if (_gracefulShutdownWaitsForRequests)
return _requestStats.getCurrent() == 0;
else
return _dispatchedStats.getCurrent() == 0;
}
};
_shutdown.cancel();
super.doStart();
statsReset();
}
@ -258,8 +251,8 @@ public class StatisticsHandler extends HandlerWrapper implements Graceful
@Override
protected void doStop() throws Exception
{
_shutdown.cancel();
super.doStop();
_shutdown = null;
}
/**
@ -610,17 +603,13 @@ public class StatisticsHandler extends HandlerWrapper implements Graceful
@Override
public CompletableFuture<Void> shutdown()
{
Shutdown shutdown = _shutdown;
if (shutdown == null)
return CompletableFuture.completedFuture(null);
return shutdown.shutdown();
return _shutdown.shutdown();
}
@Override
public boolean isShutdown()
{
Shutdown shutdown = _shutdown;
return shutdown == null || shutdown.isShutdown();
return _shutdown.isShutdown();
}
@Override

13
jetty-util/src/main/java/org/eclipse/jetty/util/component/Graceful.java
View File

@ -78,7 +78,8 @@ public interface Graceful
public CompletableFuture<Void> shutdown()
{
if (_done.get() == null)
_done.compareAndSet(null, new CompletableFuture<Void>()
{
_done.compareAndSet(null, new CompletableFuture<>()
{
@Override
public String toString()
@ -86,6 +87,7 @@ public interface Graceful
return String.format("Shutdown<%s>@%x", _component, hashCode());
}
});
}
CompletableFuture<Void> done = _done.get();
check();
return done;
@ -110,6 +112,15 @@ public interface Graceful
done.complete(null);
}
public void cancel()
{
CompletableFuture<Void> done = _done.get();
if (done != null && !done.isDone())
done.cancel(true);
_done.set(null);
}
/**
* @return True if the component is shutdown and has no remaining load.
*/