packages/openjdk-1.8.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I5RFZJ: fix dumped heap using jhat parsing to appear failied to resolve id warning message

Browse Source
This commit is contained in:
kuenking111 2022-09-16 18:44:41 +08:00
parent b3b16c119b
commit 2cda6af7b6
2 changed files with 119 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
fix-dumped-heap-using-jhat-parsing-to-appear-failed-to-resolve-object-id-warning-message.patch Normal file
View File

@ -0,0 +1,113 @@
From 68293d50de005b5982a3cce437fc7af807d7264e Mon Sep 17 00:00:00 2001
Date: Wed, 14 Sep 2022 14:57:25 +0800
Subject: fix dumped heap using jhat parsing to appear failed to
resolve object id warning message
---
hotspot/src/share/vm/services/heapDumper.cpp | 5 --
.../serviceability/dcmd/gc/HeapDumpTest.java | 77 +++++++++++++++++++
2 files changed, 77 insertions(+), 5 deletions(-)
create mode 100644 jdk/test/serviceability/dcmd/gc/HeapDumpTest.java
diff --git a/hotspot/src/share/vm/services/heapDumper.cpp b/hotspot/src/share/vm/services/heapDumper.cpp
index f7aba2a84..b5915c412 100644
--- a/hotspot/src/share/vm/services/heapDumper.cpp
+++ b/hotspot/src/share/vm/services/heapDumper.cpp
@@ -984,11 +984,6 @@ void DumperSupport::dump_class_and_array_classes(DumpWriter* writer, Klass* k) {
return;
}
- // Ignore the class if it hasn't been initialized yet
- if (!ik->is_linked()) {
- return;
- }
-
writer->write_u1(HPROF_GC_CLASS_DUMP);
// class ID
diff --git a/jdk/test/serviceability/dcmd/gc/HeapDumpTest.java b/jdk/test/serviceability/dcmd/gc/HeapDumpTest.java
new file mode 100644
index 000000000..7204c2c37
--- /dev/null
+++ b/jdk/test/serviceability/dcmd/gc/HeapDumpTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import org.testng.annotations.Test;
+import org.testng.Assert;
+import java.io.File;
+import java.nio.file.Files;
+import java.io.IOException;
+import java.util.List;
+import jdk.test.lib.hprof.HprofParser;
+import jdk.test.lib.hprof.model.Snapshot;
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.dcmd.CommandExecutor;
+import jdk.test.lib.dcmd.PidJcmdExecutor;
+/*
+ * @test
+ * @summary Test of diagnostic command GC.heap_dump
+ * @library /lib
+ * @run testng HeapDumpTest
+ */
+public class HeapDumpTest {
+ protected String heapDumpArgs = "";
+
+ public void run(CommandExecutor executor) throws IOException {
+ File dump = new File("jcmd.gc.heap_dump." + System.currentTimeMillis() + ".hprof");
+ if (dump.exists()) {
+ dump.delete();
+ }
+
+ String cmd = "GC.heap_dump " + heapDumpArgs + " " + dump.getAbsolutePath();
+ executor.execute(cmd);
+
+ verifyHeapDump(dump);
+ dump.delete();
+ }
+ private void verifyHeapDump(File dump) {
+ Assert.assertTrue(dump.exists() && dump.isFile(), "Could not create dump file " + dump.getAbsolutePath());
+ try {
+ File out = HprofParser.parse(dump);
+ Assert.assertTrue(out != null && out.exists() && out.isFile(), "Could not find hprof parser output file");
+ List<String> lines = Files.readAllLines(out.toPath());
+ Assert.assertTrue(lines.size() > 0, "hprof parser output file is empty");
+ for (String line : lines) {
+ Assert.assertFalse(line.matches(".*WARNING(?!.*Failed to resolve object.*constantPoolOop.*).*"));
+ }
+ out.delete();
+ } catch (Exception e) {
+ e.printStackTrace();
+ Assert.fail("Could not parse dump file " + dump.getAbsolutePath());
+ }
+ }
+ /* GC.heap_dump is not available over JMX, running jcmd pid executor instead */
+ @Test
+ public void pid() throws IOException {
+ run(new PidJcmdExecutor());
+ }
+}
--
2.22.0

7
openjdk-1.8.0.spec
View File

@ -916,7 +916,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
Release: 9
Release: 10
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@ -1145,6 +1145,7 @@ Patch255: Dynamic-CDS-Archive.patch
Patch256: 8202951-Support-default-jsa.patch
Patch257: 8200332-Improve-GCM-counting.patch
Patch258: dynamic-cds-_header-and-_fd-handles-are-not-free.patch
Patch259: fix-dumped-heap-using-jhat-parsing-to-appear-failed-to-resolve-object-id-warning-message.patch
#############################################
#
@ -1630,6 +1631,7 @@ pushd %{top_level_dir_name}
%patch256 -p1
%patch257 -p1
%patch258 -p1
%patch259 -p1
popd
# System library fixes
@ -2254,6 +2256,9 @@ cjc.mainProgram(arg)
%endif
%changelog
* Fri Sep 16 2022 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.342-b07.10
- add fix-dumped-heap-using-jhat-parsing-to-appear-failed-to-resolve-object-id-warning-message.patch
* Fri Sep 16 2022 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.342-b07.9
- add dynamic-cds-_header-and-_fd-handles-are-not-free.patch