From 542493989b81c0d76e7e32c1e0529ae909ed0500 Mon Sep 17 00:00:00 2001 From: Lars Francke Date: Wed, 6 Dec 2023 00:25:18 +0100 Subject: [PATCH] Changes default async-profiler support version from 1.x to 2.x --- .../2.4.12/005-HBASE-25685-2.4.12.patch | 26 +++++++++++++++++++ .../2.4.17/004-HBASE-25685-2.4.12.patch | 26 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 hbase/stackable/patches/2.4.12/005-HBASE-25685-2.4.12.patch create mode 100644 hbase/stackable/patches/2.4.17/004-HBASE-25685-2.4.12.patch diff --git a/hbase/stackable/patches/2.4.12/005-HBASE-25685-2.4.12.patch b/hbase/stackable/patches/2.4.12/005-HBASE-25685-2.4.12.patch new file mode 100644 index 000000000..e020a186d --- /dev/null +++ b/hbase/stackable/patches/2.4.12/005-HBASE-25685-2.4.12.patch @@ -0,0 +1,26 @@ +Subject: [PATCH] HBASE-25685: Switches default support for async-profiler to version 2.0 + +This patch was partially applied already but for branch 2.4 the default was kept as it is needed for async-profiler 1.0. +As we have control over the environment and 2.0 is old by now, we switch to the new version as well +--- +Index: hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +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 +--- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java (revision e04956f7bb5d95a54612a99905ee2d8e7f0de23a) ++++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java (date 1701818500309) +@@ -358,10 +358,10 @@ + 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) { diff --git a/hbase/stackable/patches/2.4.17/004-HBASE-25685-2.4.12.patch b/hbase/stackable/patches/2.4.17/004-HBASE-25685-2.4.12.patch new file mode 100644 index 000000000..e020a186d --- /dev/null +++ b/hbase/stackable/patches/2.4.17/004-HBASE-25685-2.4.12.patch @@ -0,0 +1,26 @@ +Subject: [PATCH] HBASE-25685: Switches default support for async-profiler to version 2.0 + +This patch was partially applied already but for branch 2.4 the default was kept as it is needed for async-profiler 1.0. +As we have control over the environment and 2.0 is old by now, we switch to the new version as well +--- +Index: hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +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 +--- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java (revision e04956f7bb5d95a54612a99905ee2d8e7f0de23a) ++++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java (date 1701818500309) +@@ -358,10 +358,10 @@ + 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) {