Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-22225 Profiler tab on Master/RS UI not working w/o comprehensive message

This commit is contained in:
Andrew Purtell 2019-04-26 16:41:31 -07:00
parent 729072e8ef
commit 4b84ab32b3
No known key found for this signature in database
GPG Key ID: 8597754DD5365CCD
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java
View File

@ -733,6 +733,7 @@ public class HttpServer implements FilterContainer {
genCtx.setResourceBase(tmpDir.toAbsolutePath().toString()); genCtx.setResourceBase(tmpDir.toAbsolutePath().toString());
genCtx.setDisplayName("prof-output"); genCtx.setDisplayName("prof-output");
} else { } else {
addServlet("prof", "/prof", ProfileServlet.DisabledServlet.class);
LOG.info("ASYNC_PROFILER_HOME environment variable and async.profiler.home system property " + LOG.info("ASYNC_PROFILER_HOME environment variable and async.profiler.home system property " +
"not specified. Disabling /prof endpoint."); "not specified. Disabling /prof endpoint.");
} }

27
hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileServlet.java
View File

@ -85,6 +85,7 @@ import org.apache.hbase.thirdparty.com.google.common.base.Joiner;
*/ */
@InterfaceAudience.Private @InterfaceAudience.Private
public class ProfileServlet extends HttpServlet { public class ProfileServlet extends HttpServlet {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Logger LOG = LoggerFactory.getLogger(ProfileServlet.class); private static final Logger LOG = LoggerFactory.getLogger(ProfileServlet.class);
@ -176,7 +177,10 @@ public class ProfileServlet extends HttpServlet {
if (asyncProfilerHome == null || asyncProfilerHome.trim().isEmpty()) { if (asyncProfilerHome == null || asyncProfilerHome.trim().isEmpty()) {
resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
setResponseHeader(resp); setResponseHeader(resp);
resp.getWriter().write("ASYNC_PROFILER_HOME env is not set."); resp.getWriter().write("ASYNC_PROFILER_HOME env is not set.\n\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; return;
} }
@ -357,7 +361,7 @@ public class ProfileServlet extends HttpServlet {
return Output.SVG; return Output.SVG;
} }
private void setResponseHeader(final HttpServletResponse response) { private static void setResponseHeader(final HttpServletResponse response) {
response.setHeader(ACCESS_CONTROL_ALLOW_METHODS, ALLOWED_METHODS); response.setHeader(ACCESS_CONTROL_ALLOW_METHODS, ALLOWED_METHODS);
response.setHeader(ACCESS_CONTROL_ALLOW_ORIGIN, "*"); response.setHeader(ACCESS_CONTROL_ALLOW_ORIGIN, "*");
response.setContentType(CONTENT_TYPE_TEXT); response.setContentType(CONTENT_TYPE_TEXT);
@ -372,4 +376,23 @@ public class ProfileServlet extends HttpServlet {
return asyncProfilerHome; return asyncProfilerHome;
} }
public static class DisabledServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
@Override
protected void doGet(final HttpServletRequest req, final HttpServletResponse resp)
throws IOException {
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" +
"environment is properly configured. For more information please see\n" +
"http://hbase.apache.org/book.html#profiler\n");
return;
}
}
} }