From ba0f38ffc4cc46fb014dce604d2a827f3bf9033f Mon Sep 17 00:00:00 2001 From: Viraj Jasani Date: Tue, 11 Jan 2022 15:59:44 +0530 Subject: [PATCH] HBASE-26657 ProfileServlet should move the output location to hbase specific directory (#4022) Signed-off-by: Wei-Chiu Chuang --- .../main/java/org/apache/hadoop/hbase/http/HttpServer.java | 4 ++-- .../java/org/apache/hadoop/hbase/http/ProfileServlet.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java index 395c9253ee2a..8d264a9c0d37 100644 --- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java +++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java @@ -790,10 +790,10 @@ protected void addDefaultServlets( if (Files.notExists(tmpDir)) { Files.createDirectories(tmpDir); } - ServletContextHandler genCtx = new ServletContextHandler(contexts, "/prof-output"); + ServletContextHandler genCtx = new ServletContextHandler(contexts, "/prof-output-hbase"); genCtx.addServlet(ProfileOutputServlet.class, "/*"); genCtx.setResourceBase(tmpDir.toAbsolutePath().toString()); - genCtx.setDisplayName("prof-output"); + genCtx.setDisplayName("prof-output-hbase"); } else { addUnprivilegedServlet("prof", "/prof", ProfileServlet.DisabledServlet.class); LOG.info("ASYNC_PROFILER_HOME environment variable and async.profiler.home system property " + 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 8a3ef7a913c4..e5a6905bd0f9 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 @@ -98,7 +98,7 @@ public class ProfileServlet extends HttpServlet { private static final String PROFILER_SCRIPT = "/profiler.sh"; private static final int DEFAULT_DURATION_SECONDS = 10; private static final AtomicInteger ID_GEN = new AtomicInteger(0); - static final String OUTPUT_DIR = System.getProperty("java.io.tmpdir") + "/prof-output"; + static final String OUTPUT_DIR = System.getProperty("java.io.tmpdir") + "/prof-output-hbase"; enum Event { CPU("cpu"), @@ -269,7 +269,7 @@ protected void doGet(final HttpServletRequest req, final HttpServletResponse res // set response and set refresh header to output location setResponseHeader(resp); resp.setStatus(HttpServletResponse.SC_ACCEPTED); - String relativeUrl = "/prof-output/" + outputFile.getName(); + String relativeUrl = "/prof-output-hbase/" + outputFile.getName(); resp.getWriter().write( "Started [" + event.getInternalName() + "] profiling. This page will automatically redirect to " +