Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Detach when app is running #45

Merged
merged 1 commit into from
May 11, 2022
Merged

Detach when app is running #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions server/src/main/java/com/exacaster/lighter/application/sessions/SessionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,27 @@ public Waitable launch(Application application, Consumer<Throwable> errorHandler
return app.launch();
}

@SchedulerLock(name = "keepPermanentSession")
@SchedulerLock(name = "keepPermanentSession", lockAtLeastFor = "1m")
@Scheduled(fixedRate = "1m")
public void keepPermanentSessions() throws InterruptedException {
assertLocked();
LOG.info("Start provisioning permanent sessions.");
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()))
.waitCompletion();
LOG.info("Permanent session {} needs to be (re)started.", sessionConf.getId());
var sessionToLaunch = sessionService.createSession(
sessionConf.getSubmitParams(),
sessionConf.getId()
);

sessionService.deleteOne(sessionToLaunch);
launchSession(sessionToLaunch).waitCompletion();
LOG.info("Permanent session {} (re)started.", sessionConf.getId());
}
}
LOG.info("End provisioning permanent sessions.");
}

@SchedulerLock(name = "processScheduledSessions")
Expand Down
11 changes: 7 additions & 4 deletions server/src/main/java/com/exacaster/lighter/application/sessions/SessionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

@Singleton
public class SessionService {

private final ApplicationStorage applicationStorage;
private final StatementStorage statementStorage;
private final Backend backend;
Expand Down Expand Up @@ -86,10 +87,12 @@ public Optional<Application> fetchOne(String id) {
}

public void deleteOne(String id) {
this.fetchOne(id).ifPresent(app -> {
backend.kill(app);
applicationStorage.deleteApplication(id);
});
this.fetchOne(id).ifPresent(this::deleteOne);
}

public void deleteOne(Application app) {
backend.kill(app);
applicationStorage.deleteApplication(app.getId());
}

public void killOne(Application app) {
Expand Down
8 changes: 6 additions & 2 deletions server/src/main/java/com/exacaster/lighter/spark/SparkListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.util.function.Consumer;
import org.apache.spark.launcher.SparkAppHandle;
import org.apache.spark.launcher.SparkAppHandle.Listener;
import org.apache.spark.launcher.SparkAppHandle.State;
import org.slf4j.Logger;

public class SparkListener implements Listener, Waitable {
Expand All @@ -22,9 +23,12 @@ public SparkListener(Consumer<Throwable> errorHandler) {

@Override
public void stateChanged(SparkAppHandle handle) {
LOG.info("State change. AppId: {}, State: {}", handle.getAppId(), handle.getState());
var state = handle.getState();
LOG.info("State change. AppId: {}, State: {}", handle.getAppId(), state);
handle.getError().ifPresent(errorHandler);
if (handle.getState() != null && handle.getState().isFinal()) {
// Disconnect when final or running.
// In case app fails after detach, status will be retrieved by ApplicationStatusHandler.
if (state != null && (state.isFinal() || State.RUNNING.equals(state))) {
handle.disconnect();
latch.countDown();
}
Expand Down
2 changes: 1 addition & 1 deletion server/src/test/groovy/com/exacaster/lighter/application/sessions/SessionHandlerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class SessionHandlerTest extends Specification {
handler.keepPermanentSessions()

then: "restart permanent session"
1 * service.deleteOne(session.id)
1 * service.deleteOne({ it -> it.getId() == session.getId() })
1 * service.createSession(session.submitParams, session.id) >> permanentSession
1 * handler.launch(permanentSession, _) >> EmptyWaitable.INSTANCE
}
Expand Down