correct snapshot validation before creating recording record, fix con…

…current modification exception
cryostatio · Nov 21, 2023 · 571709f · 571709f
1 parent 4165077
commit 571709f
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/src/main/java/io/cryostat/recordings/RecordingHelper.java b/src/main/java/io/cryostat/recordings/RecordingHelper.java
@@ -37,7 +37,6 @@
 import java.util.Optional;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -218,6 +217,14 @@ public ActiveRecording createSnapshot(Target target, JFRConnection connection)
 
         desc = updatedDescriptor.get();
 
+        try (InputStream snapshot = remoteRecordingStreamFactory.open(connection, target, desc)) {
+            if (!snapshotIsReadable(target, snapshot)) {
+                connection.getService().close(desc);
+                throw new SnapshotCreationException(
+                        "Snapshot was not readable - are there any source recordings?");
+            }
+        }
+
         ActiveRecording recording =
                 ActiveRecording.from(
                         target,
@@ -233,15 +240,6 @@ public ActiveRecording createSnapshot(Target target, JFRConnection connection)
         target.activeRecordings.add(recording);
         target.persist();
 
-        try (InputStream snapshot = getActiveInputStream(target.id, desc.getId())) {
-            if (!snapshotIsReadable(target, snapshot)) {
-                String snapshotName = desc.getName();
-                this.deleteRecording(target, r -> Objects.equals(r.name, snapshotName));
-                throw new SnapshotCreationException(
-                        "Snapshot was not readable - are there any source recordings?");
-            }
-        }
-
         bus.publish(
                 MessagingServer.class.getName(),
                 new Notification(
@@ -250,10 +248,6 @@ public ActiveRecording createSnapshot(Target target, JFRConnection connection)
         return recording;
     }
 
-    public void deleteRecording(Target target, Predicate<ActiveRecording> predicate) {
-        target.activeRecordings.stream().filter(predicate).forEach(ActiveRecording::delete);
-    }
-
     private boolean snapshotIsReadable(Target target, InputStream snapshot) throws IOException {
         if (!connectionManager.markConnectionInUse(target)) {
             throw new IOException(