8298043: jdk/jfr/api/consumer/recordingstream/TestStop.java failed with "Expected outer stream to have 3 events"

Reviewed-by: mgronlun

Author: egahlin

src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventDirectoryStream.java

@@ -166,18 +166,21 @@ protected void processRecursionSafe() throws IOException {
                         processUnordered(disp);
                     }
                     currentParser.resetCache();
-                    barrier.check(); // block if recording is being stopped
                     long endNanos = currentParser.getStartNanos() + currentParser.getChunkDuration();
                     // same conversion as in RecordingInfo
-                    long endMillis = Instant.ofEpochSecond(0, endNanos).toEpochMilli();
-                    if (barrier.getStreamEnd() <= endMillis) {
-                        return;
-                    }
                     if (endNanos > filterEnd) {
                         return;
                     }
                 }
-                if (isLastChunk()) {
+                long endNanos = currentParser.getStartNanos() + currentParser.getChunkDuration();
+                long endMillis = Instant.ofEpochSecond(0, endNanos).toEpochMilli();
+
+                barrier.check(); // block if recording is being stopped
+                if (barrier.getStreamEnd() <= endMillis) {
+                    return;
+                }
+
+                if (!barrier.hasStreamEnd() && isLastChunk()) {
                     // Recording was stopped/closed externally, and no more data to process.
                     return;
                 }

src/jdk.jfr/share/classes/jdk/jfr/internal/management/StreamBarrier.java

@@ -62,6 +62,10 @@ public synchronized long getStreamEnd() {
         return end;
     }
 
+    public synchronized boolean hasStreamEnd() {
+        return end != Long.MAX_VALUE;
+    }
+
     public synchronized void activate() {
         activated = true;
     }

test/jdk/ProblemList.txt

@@ -749,7 +749,6 @@ jdk/jfr/startupargs/TestStartDuration.java                      8214685 windows-
 jdk/jfr/jvm/TestWaste.java                                      8282427 generic-all
 jdk/jfr/api/consumer/recordingstream/TestOnEvent.java           8255404 linux-x64
 jdk/jfr/api/consumer/TestRecordingFileWrite.java                8287699 generic-all
-jdk/jfr/api/consumer/recordingstream/TestStop.java              8298043 generic-all
 
 ############################################################################
 

test/jdk/jdk/jfr/api/consumer/recordingstream/TestStop.java

@@ -149,7 +149,7 @@ private static void testNestedStop() throws Exception {
                 if (dumpOuter.size() != 3) {
                     throw new AssertionError("Expected outer dump to have 3 events");
                 }
-                if (outerCount.get() == 3) {
+                if (outerCount.get() != 3) {
                     throw new AssertionError("Expected outer stream to have 3 events");
                 }
                 if (dumpInner.size() != 1) {

test/jdk/jdk/jfr/jmx/streaming/TestStop.java

@@ -158,7 +158,7 @@ private static void testNestedStop() throws Exception {
                 if (dumpOuter.size() != 3) {
                     throw new AssertionError("Expected outer dump to have 3 events");
                 }
-                if (outerCount.get() == 3) {
+                if (outerCount.get() != 3) {
                     throw new AssertionError("Expected outer stream to have 3 events");
                 }
                 if (dumpInner.size() != 1) {