Increase ServerConnector accept queue size (#15596)

* Allow overwriting ServerConnector accept queue size

* Use a single config

* Fix spacing

* fix spacing

* fixed value

* read value from environment

* fix spacing

* Unpack value before reading

* check somaxconn on linux only
This commit is contained in:
George Shiqi Wu 2024-01-05 12:04:15 -05:00 committed by GitHub
parent c41e99e10c
commit 9fe67958be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 0 deletions

View File

@ -34,6 +34,7 @@ import com.google.inject.Scopes;
import com.google.inject.multibindings.Multibinder; import com.google.inject.multibindings.Multibinder;
import com.sun.jersey.guice.JerseyServletModule; import com.sun.jersey.guice.JerseyServletModule;
import com.sun.jersey.guice.spi.container.servlet.GuiceContainer; import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
import org.apache.commons.lang3.SystemUtils;
import org.apache.druid.guice.Jerseys; import org.apache.druid.guice.Jerseys;
import org.apache.druid.guice.JsonConfigProvider; import org.apache.druid.guice.JsonConfigProvider;
import org.apache.druid.guice.LazySingleton; import org.apache.druid.guice.LazySingleton;
@ -83,7 +84,10 @@ import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.cert.CRL; import java.security.cert.CRL;
import java.util.ArrayList; import java.util.ArrayList;
@ -339,6 +343,7 @@ public class JettyServerModule extends JerseyServletModule
// workaround suggested in - // workaround suggested in -
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=435322#c66 for jetty half open connection issues during failovers // https://bugs.eclipse.org/bugs/show_bug.cgi?id=435322#c66 for jetty half open connection issues during failovers
connector.setAcceptorPriorityDelta(-1); connector.setAcceptorPriorityDelta(-1);
connector.setAcceptQueueSize(getTCPAcceptQueueSize());
List<ConnectionFactory> monitoredConnFactories = new ArrayList<>(); List<ConnectionFactory> monitoredConnFactories = new ArrayList<>();
for (ConnectionFactory cf : connector.getConnectionFactories()) { for (ConnectionFactory cf : connector.getConnectionFactories()) {
@ -491,6 +496,23 @@ public class JettyServerModule extends JerseyServletModule
return numServerConnector * 8; return numServerConnector * 8;
} }
private static int getTCPAcceptQueueSize()
{
if (SystemUtils.IS_OS_LINUX) {
try {
BufferedReader in = Files.newBufferedReader(Paths.get("/proc/sys/net/core/somaxconn"));
String acceptQueueSize = in.readLine();
if (acceptQueueSize != null) {
return Integer.parseInt(acceptQueueSize);
}
}
catch (Exception e) {
log.warn("Unable to read /proc/sys/net/core/somaxconn, falling back to default value for TCP accept queue size");
}
}
return 128; // Default value of net.core.somaxconn
}
@Provides @Provides
@LazySingleton @LazySingleton
public JettyMonitor getJettyMonitor(DataSourceTaskIdHolder dataSourceTaskIdHolder) public JettyMonitor getJettyMonitor(DataSourceTaskIdHolder dataSourceTaskIdHolder)