8270021: Incorrect log decorators in gc/g1/plab/TestPLABEvacuationFai…

…lure.java Reviewed-by: tschatzl, iwalulya
openjdk · Jul 8, 2021 · 4a45d95719bf68221e6843572511c2eb741ba69c · 4a45d95 · openjdk-notifier · Jul 8, 2021
1 parent 30bba54
commit 4a45d95719bf68221e6843572511c2eb741ba69c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/test/hotspot/jtreg/gc/g1/plab/TestPLABEvacuationFailure.java b/test/hotspot/jtreg/gc/g1/plab/TestPLABEvacuationFailure.java
@@ -68,7 +68,7 @@ public class TestPLABEvacuationFailure {
             "failure wasted"));
 
     private static final String[] COMMON_OPTIONS = {
-        "-Xlog:gc=debug,gc+phases=trace",
+        "-Xlog:gc,gc+plab=debug",
         "-XX:+UseG1GC",
         "-XX:InitiatingHeapOccupancyPercent=100",
         "-XX:-G1UseAdaptiveIHOP",

diff --git a/test/hotspot/jtreg/gc/g1/plab/lib/LogParser.java b/test/hotspot/jtreg/gc/g1/plab/lib/LogParser.java
@@ -190,13 +190,17 @@ public Map<Long, PlabInfo> getExcludedSpecifiedStats(List<Long> specifiedGcIdFor
     }
 
     private Map<Long, PlabInfo> getSpecifiedStats(List<Long> gcIds, LogParser.ReportType type, List<String> fieldNames, boolean extractId) {
-        return new HashMap<>(
-                getEntries().entryStream()
-                .filter(gcLogItem -> extractId == gcIds.contains(gcLogItem.getKey()))
-                .collect(Collectors.toMap(gcLogItem -> gcLogItem.getKey(),
-                                gcLogItem -> gcLogItem.getValue().get(type).filter(fieldNames)
+        var map = new HashMap<>(
+                        getEntries().entryStream()
+                        .filter(gcLogItem -> extractId == gcIds.contains(gcLogItem.getKey()))
+                        .collect(Collectors.toMap(gcLogItem -> gcLogItem.getKey(),
+                                        gcLogItem -> gcLogItem.getValue().get(type).filter(fieldNames)
+                                )
                         )
-                )
-        );
+                 );
+        if (map.isEmpty()) {
+            throw new RuntimeException("Cannot find relevant PLAB statistics in the log");
+        }
+        return map;
     }
 }