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

HBASE-25240 gson format of RpcServer.logResponse is abnormal 

Closes #2623

Signed-off-by: Viraj Jasani <vjasani@apache.org>
This commit is contained in:
WenFeiYi 2020-11-05 19:55:08 +05:30 committed by Viraj Jasani
parent 6626cc1a33
commit 18e9660962
No known key found for this signature in database
GPG Key ID: B3D6C0B41C8ADFD5
3 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-common/src/main/java/org/apache/hadoop/hbase/util/GsonUtil.java
View File

@ -57,4 +57,8 @@ public final class GsonUtil {
}
});
}
public static GsonBuilder createGsonWithDisableHtmlEscaping() {
return createGson().disableHtmlEscaping();
}
}

42
hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestGsonUtil.java Normal file
View File

@ -0,0 +1,42 @@
/**
* 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.util;
import static org.junit.Assert.assertEquals;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hbase.thirdparty.com.google.gson.Gson;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@Category({ MiscTests.class, SmallTests.class })
public class TestGsonUtil {
private static final Gson GSON = GsonUtil.createGson().create();
private static final Gson DHE_GSON = GsonUtil.createGsonWithDisableHtmlEscaping().create();
@Test
public void testDisableHtmlEscaping() {
// enable html escaping, turn '=' into '\u003d'
assertEquals("\"\\u003d\\u003d\\u003d\"", GSON.toJson("==="));
// disable html escaping
assertEquals("\"===\"", DHE_GSON.toJson("==="));
}
}

2
hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
View File

@ -283,7 +283,7 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver {
private static final int DEFAULT_WARN_RESPONSE_TIME = 10000; // milliseconds
private static final int DEFAULT_WARN_RESPONSE_SIZE = 100 * 1024 * 1024;
protected static final Gson GSON = GsonUtil.createGson().create();
protected static final Gson GSON = GsonUtil.createGsonWithDisableHtmlEscaping().create();
protected static final int DEFAULT_TRACE_LOG_MAX_LENGTH = 1000;
protected static final String TRACE_LOG_MAX_LENGTH = "hbase.ipc.trace.log.max.length";