Fix #32638: stop DelegateProxies on shutdown

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/backend/dispatcher/ProxyDispatcherService.java

@@ -31,7 +31,10 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -42,6 +45,7 @@ public class ProxyDispatcherService {
     private final IProxySharingStoreFactory storeFactory;
     private final ConfigurableListableBeanFactory beanFactory;
     private final DefaultProxyDispatcher defaultProxyDispatcher;
+    private final List<AutoCloseable> closeables = new ArrayList<>();
 
     public ProxyDispatcherService(IProxySpecProvider proxySpecProvider,
                                   IProxySharingStoreFactory storeFactory,
@@ -62,6 +66,7 @@ public void init() {
 
                 ProxySharingScaler proxySharingScaler = createProxySharingScaler(seatStore, proxySpec, delegateProxyStore);
                 createBean(proxySharingScaler, "proxySharingScaler_" + proxySpec.getId());
+                closeables.add(proxySharingScaler);
 
                 ProxySharingDispatcher proxySharingDispatcher = new ProxySharingDispatcher(proxySpec, delegateProxyStore, seatStore);
                 createBean(proxySharingDispatcher, "proxySharingDispatcher_" + proxySpec.getId());
@@ -87,4 +92,12 @@ private <T> void createBean(T bean, String beanName) {
         beanFactory.registerSingleton(beanName, initializedBean);
     }
 
+    @PreDestroy
+    public void shutdown() throws Exception {
+        // when using beanFactory.registerSingleton, @PreDestroy is not called
+        for (AutoCloseable closeable : closeables) {
+            closeable.close();
+        }
+    }
+
 }

src/main/java/eu/openanalytics/containerproxy/backend/dispatcher/proxysharing/ProxySharingScaler.java

@@ -64,11 +64,14 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.event.EventListener;
+import org.springframework.core.env.Environment;
 import org.springframework.integration.leader.event.OnGrantedEvent;
 import org.springframework.integration.leader.event.OnRevokedEvent;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import java.time.Duration;
 import java.time.Instant;
@@ -82,9 +85,10 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
+import static eu.openanalytics.containerproxy.service.ProxyService.PROPERTY_STOP_PROXIES_ON_SHUTDOWN;
 import static net.logstash.logback.argument.StructuredArguments.kv;
 
-public class ProxySharingScaler {
+public class ProxySharingScaler implements AutoCloseable {
 
     protected static String publicPathPrefix = "/api/route/";
     protected final ExecutorService executor = ExecutorServiceFactory.create("ProxySharingScaler");
@@ -95,6 +99,7 @@ public class ProxySharingScaler {
     private final Logger logger = LoggerFactory.getLogger(getClass());
     private final ProxySpec proxySpec;
     private final String proxySpecHash;
+    private boolean stopAppsOnShutdown;
     protected ReconcileStatus lastReconcileStatus = ReconcileStatus.Stable;
     private Instant lastScaleUp = null;
 
@@ -116,6 +121,8 @@ public class ProxySharingScaler {
     private ILeaderService leaderService;
     @Inject
     private ApplicationEventPublisher applicationEventPublisher;
+    @Inject
+    private Environment environment;
 
     public ProxySharingScaler(ISeatStore seatStore, ProxySpec proxySpec, IDelegateProxyStore delegateProxyStore) {
         this.specExtension = proxySpec.getSpecExtension(ProxySharingSpecExtension.class);
@@ -130,6 +137,11 @@ public ProxySharingScaler(ISeatStore seatStore, ProxySpec proxySpec, IDelegatePr
         }
     }
 
+    @PostConstruct
+    public void init() {
+        stopAppsOnShutdown = environment.getProperty(PROPERTY_STOP_PROXIES_ON_SHUTDOWN, Boolean.class, true);
+    }
+
     public static void setPublicPathPrefix(String publicPathPrefix) {
         ProxySharingScaler.publicPathPrefix = publicPathPrefix;
     }
@@ -201,7 +213,7 @@ public void onRemoveDelegateProxiesEvent(RemoveDelegateProxiesEvent event) {
         if ((event.getSpecId() != null && !Objects.equals(event.getSpecId(), proxySpec.getId()))
             || !leaderService.isLeader()
             || (event.getId() != null && delegateProxyStore.getDelegateProxy(event.getId()) == null)
-            ) {
+        ) {
             // only handle events for this spec
             return;
         }
@@ -631,6 +643,14 @@ public void stopAll() {
         }
     }
 
+    @Override
+    public void close() throws Exception {
+        if (!stopAppsOnShutdown) {
+            return;
+        }
+        stopAll();
+    }
+
     private String getPublicPath(String targetId) {
         return publicPathPrefix + targetId + "/";
     }