Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HBASE-27141 Upgrade hbase-thirdparty dependency to 4.1.1 #4552

Merged
merged 1 commit into from
Jun 22, 2022
+13 −7
Merged

HBASE-27141 Upgrade hbase-thirdparty dependency to 4.1.1 #4552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion hbase-http/src/main/java/org/apache/hadoop/hbase/http/HttpServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion hbase-protocol-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,8 +792,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>
Expand Down Expand Up @@ -860,7 +860,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. -->
Expand Down