infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-17 05:45:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

8155570: serviceability/tmtools/jstat/GcTest02.java fails with parallel GC

Browse Source 
Reviewed-by: jwilhelm
This commit is contained in:
Leonid Mesnik 2016-10-19 10:10:51 +03:00
parent 82d31a04f7
commit 4a49bb6284
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hotspot/test/serviceability/tmtools/jstat/GcTest02.java
View File

@ -31,7 +31,6 @@ import utils.*;
* @modules java.base/jdk.internal.misc
* @library /test/lib
* @library ../share
* @ignore 8155570
* @run main/othervm -XX:+UsePerfData -Xmx128M -XX:MaxMetaspaceSize=128M GcTest02
*/

8
hotspot/test/serviceability/tmtools/jstat/utils/GcProvokerImpl.java
View File

@ -50,7 +50,7 @@ public class GcProvokerImpl implements GcProvoker {
used += memoryChunk;
} catch (OutOfMemoryError e) {
list = null;
throw new RuntimeException("Unexpected OOME while eating " + targetUsage + " of heap memory.");
throw new RuntimeException("Unexpected OOME '" + e.getMessage() + "' while eating " + targetUsage + " of heap memory.");
}
}
return list;
@ -73,8 +73,10 @@ public class GcProvokerImpl implements GcProvoker {
@Override
public void eatMetaspaceAndHeap(float targetMemoryUsagePercent) {
eatenMemory = eatHeapMemory(targetMemoryUsagePercent);
// Metaspace should be filled before Java Heap to prevent unexpected OOME
// in the Java Heap while filling Metaspace
eatenMetaspace = eatMetaspace(targetMemoryUsagePercent);
eatenMemory = eatHeapMemory(targetMemoryUsagePercent);
}
private static List<Object> eatMetaspace(float targetUsage) {
@ -97,7 +99,7 @@ public class GcProvokerImpl implements GcProvoker {
list.add(gp.create(0));
} catch (OutOfMemoryError oome) {
list = null;
throw new RuntimeException("Unexpected OOME while eating " + targetUsage + " of Metaspace.");
throw new RuntimeException("Unexpected OOME '" + oome.getMessage() + "' while eating " + targetUsage + " of Metaspace.");
}
MemoryUsage memoryUsage = metaspacePool.getUsage();
currentUsage = (((float) memoryUsage.getUsed()) / memoryUsage.getMax());