From 6d59a778d49e34f24cb1986684603f3705cb9831 Mon Sep 17 00:00:00 2001 From: Josh Elser Date: Thu, 23 May 2019 20:39:52 -0400 Subject: [PATCH] HBASE-22467 UI fixes to enable Knox proxying --- .../hadoop/hbase/http/ProfileOutputServlet.java | 12 ++++++++++-- .../org/apache/hadoop/hbase/http/ProfileServlet.java | 2 +- .../hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon | 3 ++- .../hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 4 ++-- .../hbase/tmpl/regionserver/RSStatusTmpl.jamon | 4 ++-- .../main/resources/hbase-webapps/master/table.jsp | 2 +- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileOutputServlet.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileOutputServlet.java index 670c3ac1b8..6053c72fa2 100644 --- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileOutputServlet.java +++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/ProfileOutputServlet.java @@ -19,11 +19,13 @@ package org.apache.hadoop.hbase.http; import java.io.File; import java.io.IOException; +import java.util.Map.Entry; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.hbase.thirdparty.com.google.common.base.Joiner; import org.apache.yetus.audience.InterfaceAudience; import org.eclipse.jetty.servlet.DefaultServlet; import org.slf4j.Logger; @@ -48,9 +50,15 @@ public class ProfileOutputServlet extends DefaultServlet { // will be <100 bytes (in all modes). if (requestedFile.length() < 100) { LOG.info(requestedFile + " is incomplete. Sending auto-refresh header."); - resp.setHeader("Refresh", REFRESH_PERIOD + "," + req.getRequestURI()); + String refreshUrl = req.getRequestURI(); + // Rebuild the query string (if we have one) + if (req.getQueryString() != null) { + refreshUrl += "?" + req.getQueryString(); + } + ProfileServlet.setResponseHeader(resp); + resp.setHeader("Refresh", REFRESH_PERIOD + ";" + refreshUrl); resp.getWriter().write("This page will be auto-refreshed every " + REFRESH_PERIOD + - " seconds until the output file is ready."); + " seconds until the output file is ready. Redirecting to " + refreshUrl); } else { super.doGet(req, resp); } 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 5dfaa32879..642d05a314 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 @@ -361,7 +361,7 @@ public class ProfileServlet extends HttpServlet { return Output.SVG; } - private static void setResponseHeader(final HttpServletResponse response) { + static void setResponseHeader(final HttpServletResponse response) { response.setHeader(ACCESS_CONTROL_ALLOW_METHODS, ALLOWED_METHODS); response.setHeader(ACCESS_CONTROL_ALLOW_ORIGIN, "*"); response.setContentType(CONTENT_TYPE_TEXT); diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon index c4dff1458f..f700d39947 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/common/TaskMonitorTmpl.jamon @@ -25,6 +25,7 @@ org.apache.hadoop.util.StringUtils; TaskMonitor taskMonitor = TaskMonitor.get(); String filter = "general"; String format = "html"; +String parent = ""; <%if format.equals("json")%> @@ -79,7 +80,7 @@ String format = "html"; <%args> String filter; - View as JSON + View as JSON <%def renderTasks> diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index 06fe2c9499..3d7106c01f 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -146,7 +146,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();