HBASE-29226 Migrate to jetty 12 with EE8 and bump java servlet to 4.0.1 #6783
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -72,6 +72,12 @@ | |
| import org.apache.hbase.thirdparty.com.google.common.base.Preconditions; | ||
| import org.apache.hbase.thirdparty.com.google.common.collect.ImmutableMap; | ||
| import org.apache.hbase.thirdparty.com.google.common.collect.Lists; | ||
| import org.apache.hbase.thirdparty.org.eclipse.jetty.ee8.servlet.DefaultServlet; | ||
| import org.apache.hbase.thirdparty.org.eclipse.jetty.ee8.servlet.FilterHolder; | ||
| import org.apache.hbase.thirdparty.org.eclipse.jetty.ee8.servlet.FilterMapping; | ||
| import org.apache.hbase.thirdparty.org.eclipse.jetty.ee8.servlet.ServletContextHandler; | ||
| import org.apache.hbase.thirdparty.org.eclipse.jetty.ee8.servlet.ServletHolder; | ||
| import org.apache.hbase.thirdparty.org.eclipse.jetty.ee8.webapp.WebAppContext; | ||
| import org.apache.hbase.thirdparty.org.eclipse.jetty.http.HttpVersion; | ||
| import org.apache.hbase.thirdparty.org.eclipse.jetty.server.Handler; | ||
| import org.apache.hbase.thirdparty.org.eclipse.jetty.server.HttpConfiguration; | ||
|
|
@@ -84,18 +90,10 @@ | |
| import org.apache.hbase.thirdparty.org.eclipse.jetty.server.SymlinkAllowedResourceAliasChecker; | ||
| import org.apache.hbase.thirdparty.org.eclipse.jetty.server.handler.ContextHandlerCollection; | ||
| import org.apache.hbase.thirdparty.org.eclipse.jetty.server.handler.ErrorHandler; | ||
| import org.apache.hbase.thirdparty.org.eclipse.jetty.server.handler.gzip.GzipHandler; | ||
| import org.apache.hbase.thirdparty.org.eclipse.jetty.util.ExceptionUtil; | ||
| import org.apache.hbase.thirdparty.org.eclipse.jetty.util.ssl.SslContextFactory; | ||
| import org.apache.hbase.thirdparty.org.eclipse.jetty.util.thread.QueuedThreadPool; | ||
| import org.apache.hbase.thirdparty.org.glassfish.jersey.server.ResourceConfig; | ||
| import org.apache.hbase.thirdparty.org.glassfish.jersey.servlet.ServletContainer; | ||
|
|
||
|
|
@@ -654,23 +652,21 @@ private void initializeWebServer(String name, String hostName, Configuration con | |
|
|
||
| Preconditions.checkNotNull(webAppContext); | ||
|
|
||
| Handler.Sequence handlers = new Handler.Sequence(); | ||
|
|
||
| ContextHandlerCollection contexts = new ContextHandlerCollection(); | ||
| RequestLog requestLog = HttpRequestLog.getRequestLog(name); | ||
|
|
||
| if (requestLog != null) { | ||
| webServer.setRequestLog(requestLog); | ||
| } | ||
|
|
||
| final String appDir = getWebAppsPath(name); | ||
|
|
||
| handlers.addHandler(contexts); | ||
| handlers.addHandler(webAppContext); | ||
|
|
||
| webServer.setHandler(handlers); | ||
|
|
||
| webAppContext.setAttribute(ADMINS_ACL, adminsAcl); | ||
|
|
||
|
|
@@ -715,8 +711,9 @@ private void initializeWebServer(String name, String hostName, Configuration con | |
| // Check if disable stack trace property is configured | ||
| if (!conf.getBoolean(HTTP_UI_SHOW_STACKTRACE_KEY, true)) { | ||
| // Disable stack traces for server errors in UI | ||
| ErrorHandler errorHandler = new ErrorHandler(); | ||
| errorHandler.setShowStacks(false); | ||
| webServer.setErrorHandler(errorHandler); | ||
| // Disable stack traces for web app errors in UI | ||
| webAppContext.getErrorHandler().setShowStacks(false); | ||
| } | ||
|
|
@@ -841,7 +838,8 @@ private void configureAliasChecks(ServletContextHandler context, boolean shouldS | |
| if (context.getAliasChecks().stream().anyMatch(aliasCheckerClass::isInstance)) { | ||
| LOG.debug("{} is already part of alias check list", aliasCheckerClass.getName()); | ||
| } else { | ||
| context | ||
| .addAliasCheck(new SymlinkAllowedResourceAliasChecker(context.getCoreContextHandler())); | ||
| LOG.debug("{} added to the alias check list", aliasCheckerClass.getName()); | ||
| } | ||
| LOG.info("Serving aliases allowed for /logs context"); | ||
|
|
@@ -1258,14 +1256,14 @@ public void start() throws IOException { | |
| } catch (IOException ex) { | ||
| LOG.info("HttpServer.start() threw a non Bind IOException", ex); | ||
| throw ex; | ||
| } catch (Exception ex) { | ||
|
Contributor
There was a problem hiding this comment. So Jetty just throws Exception here ?
Contributor
Author
There was a problem hiding this comment. Ah dug a little harder found alternate for old exception, let me fall back to that and revet to old logic: https://github.com/jetty/jetty.project/blob/ccdbe1742eac511914869a53f0efc2075775d0b8/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ExceptionUtil.java#L251 vs https://github.com/jetty/jetty.project/blob/jetty-9.4.x/jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java
Contributor
Author
There was a problem hiding this comment. HBase uses Jetty's method to check and throw as below. Older impl:
Contributor
Author
There was a problem hiding this comment. Maybe we should catch Error as well now? WDYT?
Contributor
There was a problem hiding this comment. The only value we add here is logging.
Contributor
There was a problem hiding this comment. Or don't catch and rely on the other catch block ? |
||
| LOG.info("HttpServer.start() threw a Exception", ex); | ||
| throw ex; | ||
| } | ||
| // Make sure there is no handler failures. | ||
| List<Handler> handlers = webServer.getHandlers(); | ||
| for (Handler handler : handlers) { | ||
| if (handler.isFailed()) { | ||
| throw new IOException("Problem in starting http server. Server handlers failed"); | ||
| } | ||
| } | ||
|
|
@@ -1335,7 +1333,7 @@ void openListeners() throws Exception { | |
| * stop the server | ||
| */ | ||
| public void stop() throws Exception { | ||
| ExceptionUtil.MultiException exception = null; | ||
| for (ListenerInfo li : listeners) { | ||
| if (!li.isManaged) { | ||
| continue; | ||
|
|
@@ -1372,9 +1370,10 @@ public void stop() throws Exception { | |
|
|
||
| } | ||
|
|
||
| private ExceptionUtil.MultiException addMultiException(ExceptionUtil.MultiException exception, | ||
| Exception e) { | ||
| if (exception == null) { | ||
| exception = new ExceptionUtil.MultiException(); | ||
| } | ||
| exception.add(e); | ||
| return exception; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.hadoop.hbase.http.log; | ||
|
|
||
| import java.io.BufferedReader; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.io.InputStreamReader; | ||
| import java.net.HttpURLConnection; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
| import java.util.stream.Collectors; | ||
| import org.apache.yetus.audience.InterfaceAudience; | ||
|
|
||
| /** | ||
| * HTTP utility class to help propagate server side exception in log level servlet to the client | ||
| * over HTTP (HTML payload) It parses HTTP client connections and recreates the exception. | ||
| */ | ||
| @InterfaceAudience.Private | ||
| public class LogLevelExceptionUtils { | ||
|
|
||
| private static void throwEx(Throwable ex) { | ||
| LogLevelExceptionUtils.<RuntimeException> throwException(ex); | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| private static <E extends Throwable> void throwException(Throwable ex) throws E { | ||
| throw (E) ex; | ||
| } | ||
|
|
||
| /** | ||
| * Validates the status of an <code>HttpURLConnection</code> against an expected HTTP status code. | ||
| * If the current status code is not the expected one it throws an exception with a detail message | ||
| * using Server side error messages if available. | ||
| * <p> | ||
| * <b>NOTE: This is an adapted version of the original method in HttpServerUtil.java of Hadoop, | ||
| * but we handle for HTML response. | ||
| * @param conn the <code>HttpURLConnection</code>. | ||
| * @param expectedStatus the expected HTTP status code. | ||
| * @throws IOException thrown if the current status code does not match the expected one. | ||
| */ | ||
| @SuppressWarnings("unchecked") | ||
| public static void validateResponse(HttpURLConnection conn, int expectedStatus) | ||
| throws IOException { | ||
| if (conn.getResponseCode() != expectedStatus) { | ||
| Exception toThrow = null; | ||
|
|
||
| try (InputStream es = conn.getErrorStream()) { | ||
| if (es != null) { | ||
| try (InputStreamReader isr = new InputStreamReader(es, StandardCharsets.UTF_8); | ||
| BufferedReader reader = new BufferedReader(isr)) { | ||
| final String errorAsHtml = reader.lines().collect(Collectors.joining("\n")); | ||
|
|
||
| final String status = extractValue(errorAsHtml, "<th>STATUS:</th><td>(\\d+)</td>"); | ||
| final String message = extractValue(errorAsHtml, "<th>MESSAGE:</th><td>([^<]+)</td>"); | ||
| final String uri = extractValue(errorAsHtml, "<th>URI:</th><td>([^<]+)</td>"); | ||
| final String exception = extractValue(errorAsHtml, "<title>([^<]+)</title>"); | ||
|
|
||
| toThrow = new IOException( | ||
| String.format("HTTP status [%s], message [%s], URL [%s], exception [%s]", status, | ||
| message, uri, exception)); | ||
| } | ||
| } | ||
| } catch (Exception ex) { | ||
| toThrow = | ||
| new IOException(String.format("HTTP status [%d], message [%s], URL [%s], exception [%s]", | ||
| conn.getResponseCode(), conn.getResponseMessage(), conn.getURL(), ex), ex); | ||
| } | ||
| if (toThrow != null) { | ||
| throwEx(toThrow); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private static String extractValue(String html, String regex) { | ||
| Pattern pattern = Pattern.compile(regex); | ||
| Matcher matcher = pattern.matcher(html); | ||
| if (matcher.find()) { | ||
| return matcher.group(1); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.