mirror of https://github.com/apache/druid.git
Merge pull request #1637 from metamx/peonPlaysNiceOnShutdown
Make jetty scheduler threads daemon thread
This commit is contained in:
commit
e79572b4bc
|
@ -51,6 +51,7 @@ import org.eclipse.jetty.server.Connector;
|
|||
import org.eclipse.jetty.server.Server;
|
||||
import org.eclipse.jetty.server.ServerConnector;
|
||||
import org.eclipse.jetty.util.thread.QueuedThreadPool;
|
||||
import org.eclipse.jetty.util.thread.ScheduledExecutorScheduler;
|
||||
|
||||
import javax.servlet.ServletException;
|
||||
import java.util.Map;
|
||||
|
@ -161,6 +162,10 @@ public class JettyServerModule extends JerseyServletModule
|
|||
|
||||
final Server server = new Server(threadPool);
|
||||
|
||||
// Without this bean set, the default ScheduledExecutorScheduler runs as non-daemon, causing lifecycle hooks to fail
|
||||
// to fire on main exit. Related bug: https://github.com/druid-io/druid/pull/1627
|
||||
server.addBean(new ScheduledExecutorScheduler("JettyScheduler", true), true);
|
||||
|
||||
ServerConnector connector = new ServerConnector(server);
|
||||
connector.setPort(node.getPort());
|
||||
connector.setIdleTimeout(Ints.checkedCast(config.getMaxIdleTime().toStandardDuration().getMillis()));
|
||||
|
|
Loading…
Reference in New Issue