AdminServer deactivate (#241)

fixes #240

Author: devhawk

transact/src/main/java/dev/dbos/transact/admin/AdminServer.java

@@ -12,6 +12,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -30,6 +31,7 @@ public class AdminServer implements AutoCloseable {
   private HttpServer server;
   private final SystemDatabase systemDatabase;
   private final DBOSExecutor dbosExecutor;
+  private final AtomicBoolean isRunning = new AtomicBoolean(true);
 
   public AdminServer(int port, DBOSExecutor exec, SystemDatabase sysDb) throws IOException {
 
@@ -39,7 +41,7 @@ public AdminServer(int port, DBOSExecutor exec, SystemDatabase sysDb) throws IOE
     Map<String, HttpHandler> staticRoutes = new HashMap<>();
     staticRoutes.put("/dbos-healthz", x -> healthCheck(x));
     staticRoutes.put("/dbos-workflow-recovery", x -> workflowRecovery(x)); // post
-    staticRoutes.put("/dbos-deactivate", x -> deactivate(x));
+    staticRoutes.put("/deactivate", x -> deactivate(x));
     staticRoutes.put("/dbos-workflow-queues-metadata", x -> workflowQueuesMetadata(x));
     staticRoutes.put("/dbos-garbage-collect", x -> garbageCollect(x)); // post
     staticRoutes.put("/dbos-global-timeout", x -> globalTimeout(x)); // post
@@ -125,7 +127,14 @@ private void workflowRecovery(HttpExchange exchange) throws IOException {
   }
 
   private void deactivate(HttpExchange exchange) throws IOException {
-    sendText(exchange, 500, "not implemented");
+    if (isRunning.compareAndSet(true, false)) {
+      logger.info(
+          "Deactivating DBOS executor {} app version {}",
+          dbosExecutor.executorId(),
+          dbosExecutor.appVersion());
+      dbosExecutor.deactivateLifecycleListeners();
+    }
+    sendText(exchange, 200, "deactivated");
   }
 
   private void workflowQueuesMetadata(HttpExchange exchange) throws IOException {

transact/src/main/java/dev/dbos/transact/execution/DBOSExecutor.java

@@ -190,13 +190,7 @@ public void close() {
       recoveryService.stop();
       recoveryService = null;
 
-      for (var listener : listeners) {
-        try {
-          listener.dbosShutDown();
-        } catch (Exception e) {
-          logger.warn("Exception from shutdown", e);
-        }
-      }
+      shutdownLifecycleListeners();
 
       queueService.stop();
       queueService = null;
@@ -211,6 +205,22 @@ public void close() {
     }
   }
 
+  public void deactivateLifecycleListeners() {
+    if (isRunning.get()) {
+      shutdownLifecycleListeners();
+    }
+  }
+
+  private void shutdownLifecycleListeners() {
+    for (var listener : listeners) {
+      try {
+        listener.dbosShutDown();
+      } catch (Exception e) {
+        logger.warn("Exception from shutdown", e);
+      }
+    }
+  }
+
   // package private method for test purposes
   SystemDatabase getSystemDatabase() {
     return systemDatabase;

transact/src/test/java/dev/dbos/transact/admin/AdminServerTest.java

@@ -146,10 +146,12 @@ public void deactivate() throws IOException {
       given()
           .port(port)
           .when()
-          .get("/dbos-deactivate")
+          .get("/deactivate")
           .then()
-          .statusCode(500)
-          .body(equalTo("not implemented"));
+          .statusCode(200)
+          .body(equalTo("deactivated"));
+
+      verify(mockExec).deactivateLifecycleListeners();
     }
   }
 

transact/src/test/java/dev/dbos/transact/execution/LifecycleTest.java

@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import dev.dbos.transact.DBOS;
+import dev.dbos.transact.DBOSTestAccess;
 import dev.dbos.transact.config.DBOSConfig;
 import dev.dbos.transact.utils.DBUtils;
 
@@ -44,18 +45,36 @@ void beforeEachTest() throws SQLException {
 
   @AfterEach
   void afterEachTest() throws Exception {
+    DBOS.shutdown();
+  }
+
+  @Test
+  void checkThatItAllHappened() throws Exception {
+    // Pretend this is an external event
+    var total = svc.runThemAll();
+    assertEquals(3, impl.nInstances); // One of these is internal... for better or worse
+    assertEquals(4, impl.nWfs);
+    assertEquals(14, svc.annotationCount);
+    assertEquals(30, total);
+
     assertEquals(0, svc.shutdownCount);
     DBOS.shutdown();
     assertEquals(1, svc.shutdownCount);
   }
 
   @Test
-  void checkThatItAllHappened() throws Exception {
+  void deactivateLifecycleListeners() throws Exception {
     // Pretend this is an external event
     var total = svc.runThemAll();
     assertEquals(3, impl.nInstances); // One of these is internal... for better or worse
     assertEquals(4, impl.nWfs);
     assertEquals(14, svc.annotationCount);
     assertEquals(30, total);
+
+    assertEquals(0, svc.shutdownCount);
+    DBOSTestAccess.getDbosExecutor().deactivateLifecycleListeners();
+    assertEquals(1, svc.shutdownCount);
+    DBOS.shutdown();
+    assertEquals(2, svc.shutdownCount);
   }
 }