Fix #33302: allow to replace DelegateProxies

Author: LEDfan

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

@@ -30,6 +30,7 @@
 import eu.openanalytics.containerproxy.event.PendingProxyEvent;
 import eu.openanalytics.containerproxy.event.ProxyStartFailedEvent;
 import eu.openanalytics.containerproxy.event.ProxyStopEvent;
+import eu.openanalytics.containerproxy.event.RemoveDelegateProxiesEvent;
 import eu.openanalytics.containerproxy.event.SeatAvailableEvent;
 import eu.openanalytics.containerproxy.event.SeatClaimedEvent;
 import eu.openanalytics.containerproxy.event.SeatReleasedEvent;
@@ -195,6 +196,26 @@ public void onProxyStartFailed(ProxyStartFailedEvent proxyStartFailedEvent) {
         pendingDelegatingProxies.remove(proxyStartFailedEvent.getProxyId());
     }
 
+    @EventListener
+    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;
+        }
+        if (event.getId() != null) {
+            // remove single proxy
+            logger.info("[{} {}] Received external request to remove DelegateProxy", kv("specId", proxySpec.getId()), kv("delegateProxyId", event.getId()));
+            globalEventLoop.schedule(() -> markDelegateProxyForRemoval(event.getId()));
+        } else {
+            // remove all proxies
+            logger.info("[{}] Received external request to remove all DelegateProxies", kv("specId", proxySpec.getId()));
+            globalEventLoop.schedule(this::markAllDelegateProxiesForRemoval);
+        }
+    }
+
     /**
      * Processes the SeatReleasedEvent, should only process one event a a time (i.e. using the event loop),
      * since it modifies the Delegateproxy.
@@ -246,6 +267,9 @@ private void processReleasedSeat(SeatReleasedEvent seatReleasedEvent) {
     private void markDelegateProxyForRemoval(String delegateProxyId) {
         // this delegateProxy will be (completely) removed by the cleanup function, not by scale-down
         DelegateProxy delegateProxy = delegateProxyStore.getDelegateProxy(delegateProxyId);
+        if (delegateProxy == null) {
+            return;
+        }
         Set<String> seatIds = delegateProxy.getSeatIds();
         DelegateProxy.DelegateProxyBuilder delegateProxyBuilder = delegateProxy.toBuilder()
             .delegateProxyStatus(DelegateProxyStatus.ToRemove);
@@ -267,6 +291,12 @@ private void markDelegateProxyForRemoval(String delegateProxyId) {
         delegateProxyStore.updateDelegateProxy(delegateProxyBuilder.build());
     }
 
+    private void markAllDelegateProxiesForRemoval() {
+        for (DelegateProxy delegateProxy : delegateProxyStore.getAllDelegateProxies()) {
+            markDelegateProxyForRemoval(delegateProxy.getProxy().getId());
+        }
+    }
+
     private void reconcile() {
         long numPendingSeats = getNumPendingSeats();
         long num = seatStore.getNumUnclaimedSeats() + numPendingSeats - pendingDelegatingProxies.size();

src/main/java/eu/openanalytics/containerproxy/event/RemoveDelegateProxiesEvent.java

@@ -0,0 +1,57 @@
+/**
+ * ContainerProxy
+ *
+ * Copyright (C) 2016-2024 Open Analytics
+ *
+ * ===========================================================================
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the Apache License as published by
+ * The Apache Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * Apache License for more details.
+ *
+ * You should have received a copy of the Apache License
+ * along with this program.  If not, see <http://www.apache.org/licenses/>
+ */
+package eu.openanalytics.containerproxy.event;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.Value;
+
+@Value
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE) // Jackson deserialize compatibility
+public class RemoveDelegateProxiesEvent extends BridgeableEvent {
+
+    String id;
+
+    String specId;
+
+    @JsonCreator
+    public RemoveDelegateProxiesEvent(@JsonProperty("source") String source,
+                                      @JsonProperty("id") String id,
+                                      @JsonProperty("specId") String specId) {
+        super(source);
+        this.id = id;
+        this.specId = specId;
+    }
+
+    public RemoveDelegateProxiesEvent(String id, String specId) {
+        this(SOURCE_NOT_AVAILABLE, id, specId);
+    }
+
+    @Override
+    public RemoveDelegateProxiesEvent withSource(String source) {
+        return new RemoveDelegateProxiesEvent(source, id, specId);
+    }
+
+}