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

W-14227000: Add system property to configure the time to wait for closing remaining connections on shutdown #562

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

W-14227000: Add system property to configure the time to wait for closing remaining connections on shutdown #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06875c9
Adding the property
eze210 Oct 11, 2023
5503445
wait forever
eze210 Oct 17, 2023
df35dd3
reorder imports
eze210 Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions src/main/java/org/mule/service/http/impl/service/HttpServiceImplementation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@
*/
package org.mule.service.http.impl.service;

import static java.util.Optional.empty;
import static java.util.Optional.of;
import static org.glassfish.grizzly.CloseReason.LOCALLY_CLOSED_REASON;
import static org.glassfish.grizzly.CloseReason.REMOTELY_CLOSED_REASON;
import static org.mule.runtime.api.i18n.I18nMessageFactory.createStaticMessage;
import static org.mule.runtime.api.scheduler.SchedulerConfig.config;
import static org.mule.runtime.api.util.MuleSystemProperties.SYSTEM_PROPERTY_PREFIX;
import static org.mule.runtime.core.api.config.MuleProperties.APP_NAME_PROPERTY;
import static org.mule.runtime.core.api.config.MuleProperties.DOMAIN_NAME_PROPERTY;
import static org.mule.runtime.core.api.config.MuleProperties.OBJECT_SCHEDULER_BASE_CONFIG;
Expand All @@ -20,7 +17,15 @@
import static org.mule.runtime.core.api.config.bootstrap.ArtifactType.POLICY;
import static org.mule.runtime.core.api.lifecycle.LifecycleUtils.disposeIfNeeded;
import static org.mule.runtime.core.api.lifecycle.LifecycleUtils.initialiseIfNeeded;

import static java.lang.Long.getLong;
import static java.util.Optional.empty;
import static java.util.Optional.of;

import static org.glassfish.grizzly.CloseReason.LOCALLY_CLOSED_REASON;
import static org.glassfish.grizzly.CloseReason.REMOTELY_CLOSED_REASON;
import static org.slf4j.LoggerFactory.getLogger;

import org.mule.runtime.api.artifact.Registry;
import org.mule.runtime.api.exception.MuleException;
import org.mule.runtime.api.lifecycle.Startable;
Expand Down Expand Up @@ -65,6 +70,8 @@ public class HttpServiceImplementation implements HttpService, Startable, Stoppa

private static final Logger logger = getLogger(HttpServiceImplementation.class);
private static final String CONTAINER_CONTEXT = "container";
private static final String HTTP_GRACEFUL_SHUTDOWN_TIMEOUT_PROPERTY_NAME =
SYSTEM_PROPERTY_PREFIX + "http.graceful.shutdown.timeout";
private static final long DEFAULT_SHUTDOWN_TIMEOUT = 200;

protected final SchedulerService schedulerService;
Expand All @@ -80,16 +87,17 @@ public HttpServiceImplementation(SchedulerService schedulerService) {

@Override
public HttpServerFactory getServerFactory() {
return new ContextHttpServerFactoryAdapter(CONTAINER_CONTEXT, empty(), listenerConnectionManager,
() -> DEFAULT_SHUTDOWN_TIMEOUT);
Supplier<Long> shutdownTimeout = () -> getLong(HTTP_GRACEFUL_SHUTDOWN_TIMEOUT_PROPERTY_NAME, DEFAULT_SHUTDOWN_TIMEOUT);
return new ContextHttpServerFactoryAdapter(CONTAINER_CONTEXT, empty(), listenerConnectionManager, shutdownTimeout);
}

@Inject
public HttpServerFactory getServerFactory(Registry registry, MuleContext muleContext) {
ArtifactType artifactType = muleContext.getArtifactType();
Optional<String> appName = registry.lookupByName(APP_NAME_PROPERTY);
Optional<String> domainName = registry.lookupByName(DOMAIN_NAME_PROPERTY);
Supplier<Long> shutdownTimeout = () -> muleContext.getConfiguration().getShutdownTimeout();
Supplier<Long> shutdownTimeout =
() -> getLong(HTTP_GRACEFUL_SHUTDOWN_TIMEOUT_PROPERTY_NAME, muleContext.getConfiguration().getShutdownTimeout());

try {
switch (artifactType) {
Expand Down
26 changes: 19 additions & 7 deletions src/main/java/org/mule/service/http/impl/service/server/grizzly/GrizzlyHttpServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
*/
package org.mule.service.http.impl.service.server.grizzly;

import static org.mule.runtime.api.util.MuleSystemProperties.MULE_LOG_SEPARATION_DISABLED;
import static org.mule.runtime.core.api.util.ClassUtils.setContextClassLoader;
import static org.mule.runtime.http.api.server.MethodRequestMatcher.acceptAll;
import static org.mule.service.http.impl.service.server.grizzly.MuleSslFilter.createSslFilter;

import static java.lang.Math.min;
import static java.lang.String.format;
import static java.lang.System.getProperty;
Expand All @@ -14,10 +19,7 @@
import static java.util.Collections.synchronizedList;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
import static org.mule.runtime.api.util.MuleSystemProperties.MULE_LOG_SEPARATION_DISABLED;
import static org.mule.runtime.core.api.util.ClassUtils.setContextClassLoader;
import static org.mule.runtime.http.api.server.MethodRequestMatcher.acceptAll;
import static org.mule.service.http.impl.service.server.grizzly.MuleSslFilter.createSslFilter;

import org.mule.runtime.api.scheduler.Scheduler;
import org.mule.runtime.api.tls.TlsContextFactory;
import org.mule.runtime.http.api.HttpConstants.Protocol;
Expand Down Expand Up @@ -53,6 +55,8 @@
public class GrizzlyHttpServer implements HttpServer, Supplier<ExecutorService> {

protected static final Logger logger = LoggerFactory.getLogger(GrizzlyHttpServer.class);
public static final int WAIT_FOREVER_FOR_CONNECTIONS_TO_CLOSE = -1;
public static final int WAIT_FOR_CONNECTIONS_INTERVAL = 50;
private static boolean REPLACE_CONTEXT_CLASSLOADER = getProperty(MULE_LOG_SEPARATION_DISABLED) == null;

private final TCPNIOTransport transport;
Expand Down Expand Up @@ -119,13 +123,13 @@ public synchronized HttpServer stop() {

if (shutdownTimeout != 0) {
synchronized (clientConnections) {
long remainingMillis = NANOSECONDS.toMillis(stopNanos - nanoTime());
long remainingMillis = getRemainingMillisToWait(stopNanos, shutdownTimeout);
while (!clientConnections.isEmpty() && remainingMillis > 0) {
long millisToWait = min(remainingMillis, 50);
long millisToWait = min(remainingMillis, WAIT_FOR_CONNECTIONS_INTERVAL);
logger.debug("There are still {} open connections on server stop. Waiting {} milliseconds",
clientConnections.size(), millisToWait);
clientConnections.wait(millisToWait);
remainingMillis = NANOSECONDS.toMillis(stopNanos - nanoTime());
remainingMillis = getRemainingMillisToWait(stopNanos, shutdownTimeout);
}

if (!clientConnections.isEmpty()) {
Expand All @@ -146,6 +150,14 @@ public synchronized HttpServer stop() {
return this;
}

private static long getRemainingMillisToWait(long stopNanos, Long shutdownTimeout) {
if (shutdownTimeout == WAIT_FOREVER_FOR_CONNECTIONS_TO_CLOSE) {
return WAIT_FOR_CONNECTIONS_INTERVAL;
} else {
return NANOSECONDS.toMillis(stopNanos - nanoTime());
}
}

@Override
public void dispose() {
// Nothing to do
Expand Down