[hbase] branch branch-2 updated: HBASE-25685 asyncprofiler2.0 no longer supports svg; wants html (#3079)

[st...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

stack pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new c8c043a  HBASE-25685 asyncprofiler2.0 no longer supports svg; wants html (#3079)
c8c043a is described below

commit c8c043a413b7c69bdb1343e9689cf2fc9854d57e
Author: Michael Stack <sa...@users.noreply.github.com>
AuthorDate: Mon Mar 22 21:24:58 2021 -0700

    HBASE-25685 asyncprofiler2.0 no longer supports svg; wants html (#3079)
    
    Signed-off-by: Wei-Chiu Chuang <we...@apache.org>
---
 .../java/org/apache/hadoop/hbase/http/ProfileServlet.java   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java
index fc75530..9662ba5 100644
--- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java
+++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java
@@ -48,7 +48,7 @@ import org.apache.hbase.thirdparty.com.google.common.base.Joiner;
  * //  -b bufsize        frame buffer size (long)
  * //  -t                profile different threads separately
  * //  -s                simple class names instead of FQN
- * //  -o fmt[,fmt...]   output format: summary|traces|flat|collapsed|svg|tree|jfr
+ * //  -o fmt[,fmt...]   output format: summary|traces|flat|collapsed|svg|tree|jfr|html
  * //  --width px        SVG width pixels (integer)
  * //  --height px       SVG frame height pixels (integer)
  * //  --minwidth px     skip frames smaller than px (double)
@@ -145,9 +145,12 @@ public class ProfileServlet extends HttpServlet {
     TRACES,
     FLAT,
     COLLAPSED,
+    // No SVG in 2.x asyncprofiler.
     SVG,
     TREE,
-    JFR
+    JFR,
+    // In 2.x asyncprofiler, this is how you get flamegraphs.
+    HTML
   }
 
   @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "SE_TRANSIENT_FIELD_NOT_RESTORED",
@@ -355,10 +358,10 @@ public class ProfileServlet extends HttpServlet {
       try {
         return Output.valueOf(outputArg.trim().toUpperCase());
       } catch (IllegalArgumentException e) {
-        return Output.SVG;
+        return Output.HTML;
       }
     }
-    return Output.SVG;
+    return Output.HTML;
   }
 
   static void setResponseHeader(final HttpServletResponse response) {
@@ -387,7 +390,7 @@ public class ProfileServlet extends HttpServlet {
       resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
       setResponseHeader(resp);
       resp.getWriter().write("The profiler servlet was disabled at startup.\n\n" +
-        "Please ensure the prerequsites for the Profiler Servlet have been installed and the\n" +
+        "Please ensure the prerequisites for the Profiler Servlet have been installed and the\n" +
         "environment is properly configured. For more information please see\n" +
         "http://hbase.apache.org/book.html#profiler\n");
       return;