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 b53f52d Revert "HBASE-25685 asyncprofiler2.0 no longer supports svg; wants html" b53f52d is described below commit b53f52dcd50a9384dc974e3c5b8046876f3247f9 Author: stack <st...@apache.org> AuthorDate: Mon Mar 22 12:48:06 2021 -0700 Revert "HBASE-25685 asyncprofiler2.0 no longer supports svg; wants html" This reverts commit ddfedb08f1e1c0fe0b8125004d96e485432cbd10. Misapplied. Revert. --- .../java/org/apache/hadoop/hbase/http/ProfileServlet.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 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 9662ba5..fc75530 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|html + * // -o fmt[,fmt...] output format: summary|traces|flat|collapsed|svg|tree|jfr * // --width px SVG width pixels (integer) * // --height px SVG frame height pixels (integer) * // --minwidth px skip frames smaller than px (double) @@ -145,12 +145,9 @@ public class ProfileServlet extends HttpServlet { TRACES, FLAT, COLLAPSED, - // No SVG in 2.x asyncprofiler. SVG, TREE, - JFR, - // In 2.x asyncprofiler, this is how you get flamegraphs. - HTML + JFR } @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "SE_TRANSIENT_FIELD_NOT_RESTORED", @@ -358,10 +355,10 @@ public class ProfileServlet extends HttpServlet { try { return Output.valueOf(outputArg.trim().toUpperCase()); } catch (IllegalArgumentException e) { - return Output.HTML; + return Output.SVG; } } - return Output.HTML; + return Output.SVG; } static void setResponseHeader(final HttpServletResponse response) { @@ -390,7 +387,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 prerequisites for the Profiler Servlet have been installed and the\n" + + "Please ensure the prerequsites 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;