fix(rules): rule application occurs within DB transaction to ensure c…

…ursor is not closed prematurely (#246)
cryostatio · Jan 19, 2024 · 53ea034 · 53ea034
1 parent 34c7a6b
commit 53ea034
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/main/java/io/cryostat/rules/RuleService.java b/src/main/java/io/cryostat/rules/RuleService.java
@@ -189,7 +189,8 @@ private IConstrainedMap<String> createRecordingOptions(Rule rule, JFRConnection
         return optionsBuilder.build();
     }
 
-    private void applyRuleToMatchingTargets(Rule rule) {
+    @Transactional
+    void applyRuleToMatchingTargets(Rule rule) {
         try (Stream<Target> targets = Target.streamAll()) {
             targets.filter(
                             target -> {

diff --git a/src/main/java/io/cryostat/rules/ScheduledArchiveJob.java b/src/main/java/io/cryostat/rules/ScheduledArchiveJob.java
@@ -27,6 +27,7 @@
 import io.cryostat.targets.Target;
 
 import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
 import org.quartz.Job;
@@ -66,8 +67,8 @@ public void execute(JobExecutionContext ctx) throws JobExecutionException {
         }
     }
 
-    private void initPreviousRecordings(
-            Target target, Rule rule, Queue<String> previousRecordings) {
+    @Transactional
+    void initPreviousRecordings(Target target, Rule rule, Queue<String> previousRecordings) {
         recordingHelper.listArchivedRecordingObjects().parallelStream()
                 .forEach(
                         item -> {
@@ -87,13 +88,15 @@ private void initPreviousRecordings(
                         });
     }
 
-    private void performArchival(ActiveRecording recording, Queue<String> previousRecordings)
+    @Transactional
+    void performArchival(ActiveRecording recording, Queue<String> previousRecordings)
             throws Exception {
         String filename = recordingHelper.saveRecording(recording);
         previousRecordings.add(filename);
     }
 
-    private void pruneArchive(Target target, Queue<String> previousRecordings, String filename)
+    @Transactional
+    void pruneArchive(Target target, Queue<String> previousRecordings, String filename)
             throws Exception {
         recordingHelper.deleteArchivedRecording(target.jvmId, filename);
         previousRecordings.remove(filename);