You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2022/06/22 15:23:26 UTC
[hbase] branch branch-2.5 updated: HBASE-27141 Upgrade hbase-thirdparty dependency to 4.1.1 (#4552)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.5 by this push:
new b47ca399c53 HBASE-27141 Upgrade hbase-thirdparty dependency to 4.1.1 (#4552)
b47ca399c53 is described below
commit b47ca399c53ea46fbfad23c3ba78432a1b223cec
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Wed Jun 22 22:38:12 2022 +0800
HBASE-27141 Upgrade hbase-thirdparty dependency to 4.1.1 (#4552)
Signed-off-by: Andrew Purtell <ap...@apache.org>
Signed-off-by: Pankaj Kumar <pa...@apache.org>
(cherry picked from commit 9bae50f83c6c300d8952527bece28c3d2c13e179)
---
.../src/main/java/org/apache/hadoop/hbase/http/HttpServer.java | 5 ++++-
hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java | 2 +-
hbase-protocol-shaded/pom.xml | 2 +-
.../src/main/java/org/apache/hadoop/hbase/thrift/Constants.java | 5 ++++-
pom.xml | 6 +++---
5 files changed, 13 insertions(+), 7 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 8b452be89e7..8c45d4f8aca 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
@@ -108,7 +108,10 @@ public class HttpServer implements FilterContainer {
private static final Logger LOG = LoggerFactory.getLogger(HttpServer.class);
private static final String EMPTY_STRING = "";
- private static final int DEFAULT_MAX_HEADER_SIZE = 64 * 1024; // 64K
+ // Jetty's max header size is Character.MAX_VALUE - 1, See ArrayTernaryTrie for more details
+ // And in newer jetty version, they add a check when creating a server so we must follow this
+ // limitation otherwise the UTs will fail
+ private static final int DEFAULT_MAX_HEADER_SIZE = Character.MAX_VALUE - 1;
static final String FILTER_INITIALIZERS_PROPERTY = "hbase.http.filter.initializers";
static final String HTTP_MAX_THREADS = "hbase.http.max.threads";
diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java
index 9a9761a90a4..970ec547c1c 100644
--- a/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java
+++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java
@@ -57,7 +57,7 @@ public class JSONBean {
private static final String COMMA = ",";
private static final String ASTERICK = "*";
private static final Logger LOG = LoggerFactory.getLogger(JSONBean.class);
- private static final Gson GSON = GsonUtil.createGson().create();
+ private static final Gson GSON = GsonUtil.createGsonWithDisableHtmlEscaping().create();
/**
* Use dumping out mbeans as JSON.
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 092cc19bd0a..e8c69c3b574 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -34,7 +34,7 @@
<!--Version of protobuf that hbase uses internally (we shade our pb)
Must match what is out in hbase-thirdparty include.
-->
- <internal.protobuf.version>3.17.3</internal.protobuf.version>
+ <internal.protobuf.version>3.21.1</internal.protobuf.version>
</properties>
<dependencies>
<!--BE CAREFUL! Any dependency added here needs to be
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/Constants.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/Constants.java
index 8eb1fef7ed3..83bb90eecef 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/Constants.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/Constants.java
@@ -27,7 +27,10 @@ public final class Constants {
private Constants() {
}
- public static final int DEFAULT_HTTP_MAX_HEADER_SIZE = 64 * 1024; // 64k
+ // Jetty's max header size is Character.MAX_VALUE - 1, See ArrayTernaryTrie for more details
+ // And in newer jetty version, they add a check when creating a server so we must follow this
+ // limitation otherwise the UTs will fail
+ public static final int DEFAULT_HTTP_MAX_HEADER_SIZE = Character.MAX_VALUE - 1;
public static final String SERVER_TYPE_CONF_KEY = "hbase.regionserver.thrift.server.type";
diff --git a/pom.xml b/pom.xml
index 06bbd578809..c9a9cc7a901 100644
--- a/pom.xml
+++ b/pom.xml
@@ -567,8 +567,8 @@
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.13</httpcore.version>
<metrics-core.version>3.2.6</metrics-core.version>
- <jackson.version>2.13.1</jackson.version>
- <jackson.databind.version>2.13.1</jackson.databind.version>
+ <jackson.version>2.13.3</jackson.version>
+ <jackson.databind.version>2.13.3</jackson.databind.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<servlet.api.version>3.1.0</servlet.api.version>
<wx.rs.api.version>2.1.1</wx.rs.api.version>
@@ -637,7 +637,7 @@
<snappy.version>1.1.8.4</snappy.version>
<xz.version>1.9</xz.version>
<zstd-jni.version>1.5.0-4</zstd-jni.version>
- <hbase-thirdparty.version>4.1.0</hbase-thirdparty.version>
+ <hbase-thirdparty.version>4.1.1</hbase-thirdparty.version>
<!-- Intraproject jar naming properties -->
<!-- TODO this is pretty ugly, but works for the moment.
Modules are pretty heavy-weight things, so doing this work isn't too bad. -->