Merge pull request #44 from exacaster/wait_completion_when_launching_…

…permanent Bugfix: Wait for permanent session submit completion
exacaster · May 11, 2022 · a8f5824 · a8f5824
2 parents d534b19 + 863014b
commit a8f5824
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/server/src/main/java/com/exacaster/lighter/application/sessions/SessionHandler.java b/server/src/main/java/com/exacaster/lighter/application/sessions/SessionHandler.java
@@ -58,16 +58,17 @@ public Waitable launch(Application application, Consumer<Throwable> errorHandler
 
     @SchedulerLock(name = "keepPermanentSession")
     @Scheduled(fixedRate = "1m")
-    public void keepPermanentSessions() {
+    public void keepPermanentSessions() throws InterruptedException {
         assertLocked();
-        appConfiguration.getSessionConfiguration().getPermanentSessions().forEach(sessionConf -> {
+        for (var sessionConf : appConfiguration.getSessionConfiguration().getPermanentSessions()) {
             var session = sessionService.fetchOne(sessionConf.getId());
             if (session.map(Application::getState).filter(this::running).isEmpty() ||
                     session.flatMap(backend::getInfo).map(ApplicationInfo::getState).filter(this::running).isEmpty()) {
                 sessionService.deleteOne(sessionConf.getId());
-                launchSession(sessionService.createSession(sessionConf.getSubmitParams(), sessionConf.getId()));
+                launchSession(sessionService.createSession(sessionConf.getSubmitParams(), sessionConf.getId()))
+                        .waitCompletion();
             }
-        });
+        }
     }
 
     @SchedulerLock(name = "processScheduledSessions")

diff --git a/server/src/test/groovy/com/exacaster/lighter/application/sessions/SessionHandlerTest.groovy b/server/src/test/groovy/com/exacaster/lighter/application/sessions/SessionHandlerTest.groovy
@@ -6,6 +6,7 @@ import com.exacaster.lighter.application.ApplicationState
 import com.exacaster.lighter.application.ApplicationStatusHandler
 import com.exacaster.lighter.application.sessions.processors.StatementHandler
 import com.exacaster.lighter.backend.Backend
+import com.exacaster.lighter.concurrency.EmptyWaitable
 import com.exacaster.lighter.configuration.AppConfiguration
 import net.javacrumbs.shedlock.core.LockAssert
 import spock.lang.Specification
@@ -111,7 +112,7 @@ class SessionHandlerTest extends Specification {
         then: "restart permanent session"
         1 * service.deleteOne(session.id)
         1 * service.createSession(session.submitParams, session.id) >> permanentSession
-        1 * handler.launch(permanentSession, _) >> {}
+        1 * handler.launch(permanentSession, _) >> EmptyWaitable.INSTANCE
     }
 
     def app() {