Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-24 05:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(service) Task heartbeat creates event log entries

Browse Source
This commit is contained in:
Viktor Lofgren 2023-08-09 14:46:38 +02:00
parent ce293029c7
commit 807fb2d052
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/common/service/src/main/java/nu/marginalia/service/control/ServiceHeartbeat.java
View File

@ -20,6 +20,7 @@ public class ServiceHeartbeat {
private final String serviceBase;
private final String instanceUUID;
private final ServiceConfiguration configuration;
private final ServiceEventLog eventLog;
private final HikariDataSource dataSource;
@ -30,11 +31,13 @@ public class ServiceHeartbeat {
@Inject
public ServiceHeartbeat(ServiceConfiguration configuration,
ServiceEventLog eventLog,
HikariDataSource dataSource)
{
this.serviceName = configuration.serviceName() + ":" + configuration.node();
this.serviceBase = configuration.serviceName();
this.configuration = configuration;
this.eventLog = eventLog;
this.dataSource = dataSource;
this.instanceUUID = configuration.instanceUuid().toString();
@ -45,7 +48,7 @@ public class ServiceHeartbeat {
}
public <T extends Enum<T>> ServiceTaskHeartbeat<T> createServiceTaskHeartbeat(Class<T> steps, String processName) {
return new ServiceTaskHeartbeat<>(steps, configuration, processName, dataSource);
return new ServiceTaskHeartbeat<>(steps, configuration, processName, eventLog, dataSource);
}

20
code/common/service/src/main/java/nu/marginalia/service/control/ServiceTaskHeartbeat.java
View File

@ -27,6 +27,7 @@ public class ServiceTaskHeartbeat<T extends Enum<T>> implements AutoCloseable {
private final int heartbeatInterval = Integer.getInteger("mcp.heartbeat.interval", 1);
private final String serviceInstanceUUID;
private final int stepCount;
private final ServiceEventLog eventLog;
private volatile boolean running = false;
private volatile int stepNum = 0;
@ -35,8 +36,10 @@ public class ServiceTaskHeartbeat<T extends Enum<T>> implements AutoCloseable {
ServiceTaskHeartbeat(Class<T> stepClass,
ServiceConfiguration configuration,
String taskName,
ServiceEventLog eventLog,
HikariDataSource dataSource)
{
this.eventLog = eventLog;
this.taskName = configuration.serviceName() + "." + taskName + ":" + configuration.node();
this.taskBase = configuration.serviceName() + "." + taskName;
this.dataSource = dataSource;
@ -46,6 +49,8 @@ public class ServiceTaskHeartbeat<T extends Enum<T>> implements AutoCloseable {
this.stepCount = stepClass.getEnumConstants().length;
heartbeatInit();
runnerThread = new Thread(this::run);
runnerThread.start();
}
@ -58,6 +63,7 @@ public class ServiceTaskHeartbeat<T extends Enum<T>> implements AutoCloseable {
public void progress(T step) {
this.step = step.name();
// off by one since we calculate the progress based on the number of steps,
// and Enum.ordinal() is zero-based (so the 5th step in a 5 step task is 4, not 5; resulting in the
// final progress being 80% and not 100%)
@ -65,6 +71,7 @@ public class ServiceTaskHeartbeat<T extends Enum<T>> implements AutoCloseable {
this.stepNum = 1 + step.ordinal();
logger.info("ServiceTask {} progress: {}", taskBase, step.name());
eventLog.logEvent("TASK-STEP", taskName + " = " + step.name());
}
public void shutDown() {
@ -89,8 +96,6 @@ public class ServiceTaskHeartbeat<T extends Enum<T>> implements AutoCloseable {
return;
try {
heartbeatInit();
while (running) {
try {
heartbeatUpdate();
@ -102,13 +107,13 @@ public class ServiceTaskHeartbeat<T extends Enum<T>> implements AutoCloseable {
TimeUnit.SECONDS.sleep(heartbeatInterval);
}
}
catch (InterruptedException|SQLException ex) {
catch (InterruptedException ex) {
logger.error("ServiceHeartbeat caught irrecoverable exception, killing service", ex);
System.exit(255);
}
}
private void heartbeatInit() throws SQLException {
private void heartbeatInit() {
try (var connection = dataSource.getConnection()) {
try (var stmt = connection.prepareStatement(
"""
@ -131,6 +136,12 @@ public class ServiceTaskHeartbeat<T extends Enum<T>> implements AutoCloseable {
stmt.executeUpdate();
}
}
catch (SQLException ex) {
logger.error("ServiceHeartbeat failed to initialize", ex);
throw new RuntimeException(ex);
}
eventLog.logEvent("TASK-STARTED", taskName);
}
private void heartbeatUpdate() throws SQLException {
@ -173,6 +184,7 @@ public class ServiceTaskHeartbeat<T extends Enum<T>> implements AutoCloseable {
stmt.executeUpdate();
}
}
eventLog.logEvent("TASK-TERMINATED", taskName);
}
@Override