adjusted UI to view more data of a running trigger

Author: sterlp

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## v1.6.1
 -   simpler RetryStrategy - as function
+-   showing last ping
+-   showing execution time or still running triggers
+-   saver way to keep track of running triggers
 
 ## v1.6.0 - (2025-03-11)
 

core/src/main/java/org/sterl/spring/persistent_tasks/api/Trigger.java

@@ -23,6 +23,8 @@ public class Trigger {
 
     private OffsetDateTime runAt = OffsetDateTime.now();
 
+    private OffsetDateTime lastPing;
+
     private OffsetDateTime start;
 
     private OffsetDateTime end;

core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/SchedulerService.java

@@ -8,6 +8,7 @@
 import java.util.Optional;
 import java.util.concurrent.Future;
 
+import org.slf4j.event.Level;
 import org.springframework.lang.NonNull;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -80,7 +81,9 @@ public SchedulerEntity getScheduler() {
     }
 
     public Optional<SchedulerEntity> findStatus(String name) {
-        return editSchedulerStatus.find(name);
+        if (name == null) return Optional.empty();
+        else if (name.equals(this.name)) return Optional.of(getScheduler());
+        else return editSchedulerStatus.find(name);
     }
 
     /**
@@ -111,7 +114,7 @@ public List<Future<TriggerKey>> triggerNextTasks(OffsetDateTime timeDue) {
 
             return taskExecutor.submit(result);
         } else {
-            log.debug("No free threads {}/{} right now to run jobs due for: {}",
+            log.info("No free threads {}/{} right now to run jobs due for: {}",
                     taskExecutor.getFreeThreads(),
                     taskExecutor.getMaxThreads(),
                     timeDue);
@@ -151,7 +154,7 @@ public List<TriggerEntity> rescheduleAbandonedTasks(OffsetDateTime timeout) {
                 .toList();
 
         int running = triggerService.markTriggersAsRunning(runningKeys, name);
-        log.debug("({}) - {} trigger(s) are running on {} schedulers", 
+        log.atLevel(running > 0 ? Level.INFO : Level.DEBUG).log("({}) - {} trigger(s) are running on {} schedulers", 
                 running, runningKeys, schedulers);
         return triggerService.rescheduleAbandonedTasks(timeout);
     }

core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/component/TaskExecutorComponent.java

@@ -42,9 +42,10 @@ public class TaskExecutorComponent implements Closeable {
     private Duration maxShutdownWaitTime = Duration.ofSeconds(10);
     @Nullable
     private ExecutorService executor;
+    // also the LOCK object ...
     private final ConcurrentHashMap<TriggerEntity, Future<TriggerKey>> runningTasks = new ConcurrentHashMap<>();
     private final AtomicBoolean stopped = new AtomicBoolean(true);
-    
+
     public TaskExecutorComponent(String schedulerName, TriggerService triggerService, int maxThreads) {
         super();
         this.schedulerName = schedulerName;
@@ -54,7 +55,8 @@ public TaskExecutorComponent(String schedulerName, TriggerService triggerService
 
     @NonNull
     public List<Future<TriggerKey>> submit(List<TriggerEntity> trigger) {
-        if (trigger == null || trigger.isEmpty()) return Collections.emptyList();
+        if (trigger == null || trigger.isEmpty())
+            return Collections.emptyList();
 
         final List<Future<TriggerKey>> result = new ArrayList<>(trigger.size());
         for (TriggerEntity triggerEntity : trigger) {
@@ -71,9 +73,13 @@ public Future<TriggerKey> submit(@Nullable TriggerEntity trigger) {
         if (stopped.get() || executor == null) {
             throw new IllegalStateException("Executor of " + schedulerName + " is already stopped");
         }
-        
-        final var result = executor.submit(() -> runTrigger(trigger));
-        runningTasks.put(trigger, result);
+
+        Future<TriggerKey> result;
+        synchronized (runningTasks) {
+            result = executor.submit(() -> runTrigger(trigger));
+            runningTasks.put(trigger, result);
+        }
+
         return result;
     }
 
@@ -88,7 +94,7 @@ private TriggerKey runTrigger(TriggerEntity trigger) {
 
     public void start() {
         if (stopped.compareAndExchange(true, false)) {
-            synchronized (stopped) {
+            synchronized (runningTasks) {
                 runningTasks.clear();
                 executor = Executors.newFixedThreadPool(maxThreads.get());
                 log.info("Started {} with {} threads.", schedulerName, maxThreads.get());
@@ -99,7 +105,7 @@ public void start() {
     @Override
     public void close() {
         if (stopped.compareAndExchange(false, true)) {
-            synchronized (stopped) {
+            synchronized (runningTasks) {
                 doShutdown();
             }
         }
@@ -109,8 +115,8 @@ private void doShutdown() {
         if (executor != null) {
             executor.shutdown();
             if (runningTasks.size() > 0) {
-                log.info("Shutdown {} with {} running tasks, waiting for {}.",
-                        schedulerName, runningTasks.size(), maxShutdownWaitTime);
+                log.info("Shutdown {} with {} running tasks, waiting for {}.", schedulerName, runningTasks.size(),
+                        maxShutdownWaitTime);
 
                 try {
                     executor.awaitTermination(maxShutdownWaitTime.getSeconds(), TimeUnit.SECONDS);
@@ -129,8 +135,8 @@ private void doShutdown() {
 
     public void shutdownNow() {
         if (stopped.compareAndExchange(false, true)) {
-            if (executor != null) {
-                synchronized (executor) {
+            synchronized (runningTasks) {
+                if (executor != null) {
                     executor.shutdownNow();
                     log.info("Force stop {} with {} running tasks", schedulerName, runningTasks.size());
                     runningTasks.clear();
@@ -146,7 +152,7 @@ public int getFreeThreads() {
         }
         return Math.max(maxThreads.get() - runningTasks.size(), 0);
     }
-    
+
     public int countRunning() {
         return runningTasks.size();
     }
@@ -158,14 +164,15 @@ public Collection<Future<TriggerKey>> getRunningTasks() {
     public boolean isStopped() {
         return stopped.get() || maxThreads.get() <= 0;
     }
-    
+
     public List<TriggerEntity> getRunningTriggers() {
         return Collections.list(this.runningTasks.keys());
     }
 
     public void setMaxThreads(int value) {
         this.maxThreads.set(value);
     }
+
     public int getMaxThreads() {
         return isStopped() ? 0 : this.maxThreads.get();
     }

core/src/main/java/org/sterl/spring/persistent_tasks/trigger/api/TriggerConverter.java

@@ -16,6 +16,7 @@ public Trigger convert(TriggerEntity source) {
             result.setId(source.getId());
             result.setInstanceId(source.getId());
             result.setRunningOn(source.getRunningOn());
+            result.setLastPing(source.getLastPing());
             return result;
         }
     }

example/pom.xml

@@ -17,7 +17,7 @@
         <spt.version>1.5.6</spt.version>
     -->
     <properties>
-        <spt.version>1.6.0-SNAPSHOT</spt.version>
+        <spt.version>1.6.1-SNAPSHOT</spt.version>
     </properties>
 
     <dependencies>

example/src/main/java/org/sterl/spring/example_app/ExampleApplication.java

@@ -1,6 +1,7 @@
 package org.sterl.spring.example_app;
 
 import java.net.UnknownHostException;
+import java.time.Duration;
 
 import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.boot.SpringApplication;
@@ -22,6 +23,7 @@
 import org.sterl.spring.persistent_tasks.scheduler.SchedulerService;
 import org.sterl.spring.persistent_tasks.scheduler.component.EditSchedulerStatusComponent;
 import org.sterl.spring.persistent_tasks.scheduler.component.TaskExecutorComponent;
+import org.sterl.spring.persistent_tasks.scheduler.config.SchedulerConfig;
 import org.sterl.spring.persistent_tasks.scheduler.config.SchedulerConfig.SchedulerCustomizer;
 import org.sterl.spring.persistent_tasks.trigger.TriggerService;
 import org.sterl.spring.persistent_tasks_ui.EnableSpringPersistentTasksUI;
@@ -65,14 +67,14 @@ GroupedOpenApi springPersistentTasksApi() {
 
     // just one more for demonstration
     @Bean(name = "schedulerB", initMethod = "start", destroyMethod = "stop")
-    @SuppressWarnings("resource")
     SchedulerService schedulerB(
             TriggerService triggerService, 
             EditSchedulerStatusComponent editSchedulerStatus,
             TransactionTemplate trx) throws UnknownHostException {
 
-        return new SchedulerService("schedulerB", triggerService, 
-                new TaskExecutorComponent(triggerService, 7), editSchedulerStatus, trx);
+        return SchedulerConfig.newSchedulerService("schedulerB", 
+                triggerService, 
+                editSchedulerStatus, 7, Duration.ofSeconds(1), trx);
     }
 
     @Bean

ui/src/scheduler/views/scheduler.view.tsx

@@ -20,26 +20,28 @@ const SchedulerStatusView = ({ scheduler }: Props) => {
                         Last Ping: {durationSince(new Date(scheduler.lastPing))}
                     </Col>
                     <Col>
-                        <Form.Label htmlFor={"slot-" + name}>
+                        <Form.Label htmlFor={"slot-" + scheduler.id}>
                             {"Running " +
-                                scheduler.runnungTasks +
+                                scheduler.runningTasks +
                                 " of " +
                                 scheduler.tasksSlotCount}
                         </Form.Label>
                         <ProgressBar
-                            id={"slot-" + name}
+                            id={"slot-" + scheduler.id}
                             animated={true}
                             min={0}
-                            now={scheduler.runnungTasks}
+                            now={scheduler.runningTasks}
                             max={scheduler.tasksSlotCount}
                         ></ProgressBar>
                     </Col>
                 </Row>
                 <Row>
                     <Col>
-                        <Form.Label htmlFor={"cpu-" + name}>CPU</Form.Label>
+                        <Form.Label htmlFor={"cpu-" + scheduler.id}>
+                            CPU
+                        </Form.Label>
                         <ProgressBar
-                            id={"cpu-" + name}
+                            id={"cpu-" + scheduler.id}
                             animated={true}
                             min={0}
                             now={scheduler.systemLoadAverage}
@@ -52,14 +54,14 @@ const SchedulerStatusView = ({ scheduler }: Props) => {
                         ></ProgressBar>
                     </Col>
                     <Col>
-                        <Form.Label htmlFor={"memory-" + name}>
+                        <Form.Label htmlFor={"memory-" + scheduler.id}>
                             Memory{" "}
                             {formatMemory(scheduler.usedHeap) +
                                 " of " +
                                 formatMemory(scheduler.maxHeap)}
                         </Form.Label>
                         <ProgressBar
-                            id={"memory-" + name}
+                            id={"memory-" + scheduler.id}
                             animated={true}
                             min={0}
                             now={scheduler.usedHeap}

ui/src/server-api.d.ts

@@ -63,6 +63,7 @@ export interface Trigger {
     runningOn: string;
     createdTime: string;
     runAt: string;
+    lastPing: string;
     start: string;
     end: string;
     executionCount: number;

ui/src/shared/view/trigger-list-item.view.tsx

@@ -117,6 +117,12 @@ const TriggerItemView = ({
 
 export default TriggerItemView;
 
+function runningSince(value?: string) {
+    if (!value) return "";
+    const msRuntime = new Date().getTime() - new Date(value).getTime();
+    return `since ${formatMs(msRuntime)}`;
+}
+
 const TriggerCompactView = ({ trigger }: { trigger: Trigger }) => (
     <Row className="align-items-center">
         <Col className="col-2">
@@ -138,7 +144,9 @@ const TriggerCompactView = ({ trigger }: { trigger: Trigger }) => (
             {trigger.runningOn ? (
                 <LabeledText
                     label={`Running on (${trigger.executionCount})`}
-                    value={trigger.runningOn}
+                    value={
+                        trigger.runningOn + " " + runningSince(trigger.start)
+                    }
                 />
             ) : (
                 <LabeledText
@@ -200,10 +208,24 @@ const TriggerDetailsView = ({
                 <Col md="6" xl="4">
                     <LabeledText
                         label="Duration MS"
-                        value={formatMs(trigger.runningDurationInMs)}
+                        value={
+                            trigger.runningDurationInMs
+                                ? formatMs(trigger.runningDurationInMs)
+                                : runningSince(trigger.start)
+                        }
                     />
                 </Col>
             </Row>
+            {trigger.lastPing ? (
+                <Row>
+                    <Col md="12">
+                        <LabeledText
+                            label="Last keep alive ping"
+                            value={formatShortDateTime(trigger.lastPing)}
+                        />
+                    </Col>
+                </Row>
+            ) : undefined}
             <Row className="mt-2">
                 <Col>
                     <TriggerHistoryListView triggers={history} />