fix rule execution and pruning

cryostatio · May 7, 2024 · 2d2462b · 2d2462b
1 parent 22c2845
commit 2d2462b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/src/main/java/io/cryostat/rules/RuleService.java b/src/main/java/io/cryostat/rules/RuleService.java
@@ -208,9 +208,9 @@ private void scheduleArchival(Rule rule, Target target, ActiveRecording recordin
         }
 
         Map<String, Object> data = jobDetail.getJobDataMap();
-        data.put("rule", rule);
-        data.put("target", target);
-        data.put("recording", recording);
+        data.put("rule", rule.id);
+        data.put("target", target.id);
+        data.put("recording", recording.id);
 
         Trigger trigger =
                 TriggerBuilder.newTrigger()

diff --git a/src/main/java/io/cryostat/rules/ScheduledArchiveJob.java b/src/main/java/io/cryostat/rules/ScheduledArchiveJob.java
@@ -26,12 +26,13 @@
 import io.cryostat.recordings.RecordingHelper;
 import io.cryostat.targets.Target;
 
-import io.quarkus.narayana.jta.QuarkusTransaction;
 import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
 
 class ScheduledArchiveJob implements Job {
 
@@ -46,25 +47,27 @@ class ScheduledArchiveJob implements Job {
     String archiveBucket;
 
     @Override
-    public void execute(JobExecutionContext ctx) {
-        var rule = (Rule) ctx.getJobDetail().getJobDataMap().get("rule");
-        var target = (Target) ctx.getJobDetail().getJobDataMap().get("target");
-        var recording = (ActiveRecording) ctx.getJobDetail().getJobDataMap().get("recording");
+    @Transactional
+    public void execute(JobExecutionContext ctx) throws JobExecutionException {
+        long ruleId = (long) ctx.getJobDetail().getJobDataMap().get("rule");
+        Rule rule = Rule.find("id", ruleId).singleResult();
+        long targetId = (long) ctx.getJobDetail().getJobDataMap().get("target");
+        Target target = Target.find("id", id).singleResult();
+        long recordingId = (long) ctx.getJobDetail().getJobDataMap().get("recording");
+        ActiveRecording recording = ActiveRecording.find("id", recordingId).singleResult();
 
         Queue<String> previousRecordings = new ArrayDeque<>(rule.preservedArchives);
 
         initPreviousRecordings(target, rule, previousRecordings);
-
         while (previousRecordings.size() >= rule.preservedArchives) {
             pruneArchive(target, previousRecordings, previousRecordings.remove());
         }
-        previousRecordings.add(
-                QuarkusTransaction.joiningExisting()
-                        .call(
-                                () ->
-                                        recordingHelper
-                                                .archiveRecording(recording, null, null)
-                                                .name()));
+
+        try {
+            previousRecordings.add(recordingHelper.archiveRecording(recording, null, null).name());
+        } catch (Exception e) {
+            throw new JobExecutionException(e);
+        }
     }
 
     void initPreviousRecordings(Target target, Rule rule, Queue<String> previousRecordings) {