From 54fc1094bfdd0b6650595b93ab331a3b120ebef6 Mon Sep 17 00:00:00 2001
From: Chuansheng Lu <chuansheng.lcs@alibaba-inc.com>
Date: Fri, 23 Aug 2019 14:11:56 +0800
Subject: [PATCH] [RAS] Fixed uninitialized field of HeapDumper

Summary: _mini_dump is not initialized for all paths

Test Plan: test/serviceability/

Reviewed-by: D-D-H, kuaiwei

Issue: https://github.com/alibaba/dragonwell8/issues/45
---
 src/share/vm/services/heapDumper.hpp          |  3 +-
 .../jmap-minidump/TestNoMinidumpAtFullGC.java | 81 +++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 test/serviceability/sa/jmap-minidump/TestNoMinidumpAtFullGC.java

diff --git a/src/share/vm/services/heapDumper.hpp b/src/share/vm/services/heapDumper.hpp
index 89afddf21..14355a54d 100644
--- a/src/share/vm/services/heapDumper.hpp
+++ b/src/share/vm/services/heapDumper.hpp
@@ -51,7 +51,8 @@ class HeapDumper : public StackObj {
   elapsedTimer _t;
 
   HeapDumper(bool gc_before_heap_dump, bool print_to_tty, bool oome) :
-    _gc_before_heap_dump(gc_before_heap_dump), _error(NULL), _print_to_tty(print_to_tty), _oome(oome) { }
+    _gc_before_heap_dump(gc_before_heap_dump), _error(NULL),
+    _print_to_tty(print_to_tty), _oome(oome), _mini_dump(false) { }
 
   // string representation of error
   char* error() const                   { return _error; }
diff --git a/test/serviceability/sa/jmap-minidump/TestNoMinidumpAtFullGC.java b/test/serviceability/sa/jmap-minidump/TestNoMinidumpAtFullGC.java
new file mode 100644
index 000000000..9405d2d63
--- /dev/null
+++ b/test/serviceability/sa/jmap-minidump/TestNoMinidumpAtFullGC.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2019 Alibaba Group Holding Limited. 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. Alibaba designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+import com.oracle.java.testlibrary.OutputAnalyzer;
+import com.oracle.java.testlibrary.ProcessTools;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.LinkedList;
+import java.util.List;
+import static com.oracle.java.testlibrary.Asserts.*;
+
+/**
+ * @test TestNoMinidumpAtFullGC
+ * @summary Test to enasure mini-heap-dump not triggered when -XX:+HeapDumpBeforeFullGC
+ * @library /testlibrary
+ * @build TestNoMinidumpAtFullGC
+ * @run main/othervm TestNoMinidumpAtFullGC
+ */
+
+public class TestNoMinidumpAtFullGC {
+
+    private static final int M = 1024 * 1024;
+
+    // child process which creates a lot of primitive array and will OOM anyway
+    public static class OOMWorker {
+        public static void main(String[] args) {
+            List<Object> holder = new LinkedList<>();
+            while (true) {
+                holder.add(new int[4096]);
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        String[] heapDumpOomOpts = {
+                "-XX:+HeapDumpBeforeFullGC",
+                "-XX:+HeapDumpAfterFullGC",
+                "-XX:+HeapDumpOnOutOfMemoryError",
+        };
+        try {
+            for (String oomOpt : heapDumpOomOpts) {
+                ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                        "-Xmx128m",
+                        "-Xms128m",
+                        oomOpt,
+                        OOMWorker.class.getName()
+                );
+                OutputAnalyzer output = new OutputAnalyzer(pb.start());
+                output.shouldContain("java.lang.OutOfMemoryError: Java heap space");
+                output.shouldContain("Dumping heap to");
+                assertNotEquals(0, output.getExitValue());
+                Files.walk(Paths.get("."))
+                        .filter(p -> p.toString().contains("java_pid"))
+                        // if mini-heap-dump triggered, the dump size is only several mega-bytes;
+                        // otherwise, it would be definitely more than 100MB
+                        .forEach(p -> assertGreaterThan(p.toFile().length(), 100L * M));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+}
-- 
GitLab