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

HBASE-26087 JVM crash when displaying RPC params by MonitoredRPCHandler (#3489) 

Signed-off-by: stack <stack@apache.org>
This commit is contained in:
Xiaolin Ha 2021-08-18 13:28:46 +08:00 committed by GitHub
parent 721cb96f8c
commit 10c837f0e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 89 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring/MonitoredRPCHandlerImpl.java
View File

@ -22,10 +22,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.client.Operation;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hbase.thirdparty.com.google.protobuf.Message;
/**
@ -43,6 +43,8 @@ public class MonitoredRPCHandlerImpl extends MonitoredTaskImpl
private String methodName = "";
private Object [] params = {};
private Message packet;
private boolean snapshot = false;
private Map<String, Object> callInfoMap = new HashMap<>();
public MonitoredRPCHandlerImpl() {
super();
@ -53,11 +55,14 @@ public class MonitoredRPCHandlerImpl extends MonitoredTaskImpl
@Override
public synchronized MonitoredRPCHandlerImpl clone() {
return (MonitoredRPCHandlerImpl) super.clone();
MonitoredRPCHandlerImpl clone = (MonitoredRPCHandlerImpl) super.clone();
clone.setCallInfoMap(generateCallInfoMap());
clone.setSnapshot(true);
return clone;
}
/**
* Gets the status of this handler; if it is currently servicing an RPC,
* Gets the status of this handler; if it is currently servicing an RPC,
* this status will include the RPC information.
* @return a String describing the current status.
*/
@ -233,6 +238,18 @@ public class MonitoredRPCHandlerImpl extends MonitoredTaskImpl
@Override
public synchronized Map<String, Object> toMap() {
return this.snapshot ? this.callInfoMap : generateCallInfoMap();
}
public void setSnapshot(boolean snapshot) {
this.snapshot = snapshot;
}
public void setCallInfoMap(Map<String, Object> callInfoMap) {
this.callInfoMap = callInfoMap;
}
private Map<String, Object> generateCallInfoMap() {
// only include RPC info if the Handler is actively servicing an RPC call
Map<String, Object> map = super.toMap();
if (getState() != State.RUNNING) {

71
hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
View File

@ -17,10 +17,13 @@
*/
package org.apache.hadoop.hbase.monitoring;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
@ -34,9 +37,12 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Category({MiscTests.class, SmallTests.class})
public class TestTaskMonitor {
private static final Logger LOG = LoggerFactory.getLogger(TestTaskMonitor.class);
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
@ -226,5 +232,66 @@ public class TestTaskMonitor {
assertEquals("status3", task.getStatusJournal().get(1).getStatus());
tm.shutdown();
}
@Test
public void testClone() throws Exception {
MonitoredRPCHandlerImpl monitor = new MonitoredRPCHandlerImpl();
monitor.abort("abort RPC");
TestParam testParam = new TestParam("param1");
monitor.setRPC("method1", new Object[]{ testParam }, 0);
MonitoredRPCHandlerImpl clone = monitor.clone();
assertEquals(clone.getDescription(), monitor.getDescription());
assertEquals(clone.getState(), monitor.getState());
assertEquals(clone.getStatus(), monitor.getStatus());
assertEquals(clone.toString(), monitor.toString());
assertEquals(clone.toMap(), monitor.toMap());
assertEquals(clone.toJSON(), monitor.toJSON());
// mark complete and make param dirty
monitor.markComplete("complete RPC");
testParam.setParam("dirtyParam");
assertEquals(clone.getDescription(), monitor.getDescription());
assertNotEquals(clone.getState(), monitor.getState());
assertNotEquals(clone.getStatus(), monitor.getStatus());
monitor.setState(MonitoredTask.State.RUNNING);
try {
// when markComplete, the param in monitor is set null, so toMap should fail here
monitor.toMap();
fail("Should not call toMap successfully, because param=null");
} catch (Exception e) {
}
// the param of clone monitor should not be dirty
assertNotEquals("[dirtyString]",
String.valueOf(((Map<String, Object>) clone.toMap().get("rpcCall")).get("params")));
monitor.resume("resume");
monitor.setRPC("method2", new Object[]{new TestParam("param2")}, 1);
assertNotEquals(((Map<String, Object>) clone.toMap().get("rpcCall")).get("params"),
((Map<String, Object>) monitor.toMap().get("rpcCall")).get(
"params"));
LOG.info(String.valueOf(clone.toMap()));
LOG.info(String.valueOf(monitor.toMap()));
assertNotEquals(clone.toString(), monitor.toString());
assertNotEquals(clone.getRPCQueueTime(), monitor.getRPCQueueTime());
assertNotEquals(clone.toMap(), monitor.toMap());
assertNotEquals(clone.toJSON(), monitor.toJSON());
}
private class TestParam {
public String param = null;
public TestParam(String param) {
this.param = param;
}
public void setParam(String param) {
this.param = param;
}
@Override
public String toString() {
return param;
}
}
}