From ab65acb81e2b23827d7f6efad72b2d80817b2df0 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Wed, 8 Jul 2020 21:16:57 -0400
Subject: [PATCH] shutdown background jobs before killing node

---
 .../main/java/bubble/service/cloud/StandardNetworkService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java b/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java
index ce50749e..c4e2c432 100644
--- a/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java
+++ b/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java
@@ -425,6 +425,7 @@ public class StandardNetworkService implements NetworkService {
             return die("newNode: "+e, e);
 
         } finally {
+            backgroundJobs.shutdownNow();
             if (computeDriver != null) {
                 try {
                     computeDriver.cleanupStart(node);
@@ -457,7 +458,6 @@ public class StandardNetworkService implements NetworkService {
                 closeQuietly(progressMeter);
             }
             unlockNetwork(nn.getNetwork(), lock);
-            backgroundJobs.shutdownNow();
         }
         return node;
     }