Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes default async-profiler support version from 1.x to 2.x #516

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+52 −0
Open

Changes default async-profiler support version from 1.x to 2.x #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions hbase/stackable/patches/2.4.12/005-HBASE-25685-2.4.12.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {
26 changes: 26 additions & 0 deletions hbase/stackable/patches/2.4.17/004-HBASE-25685-2.4.12.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {