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

HBASE-17381 ReplicationSourceWorkerThread can die due to unhandled exceptions (huzheng) 

Signed-off-by: Gary Helmling <garyh@apache.org>
This commit is contained in:
huzheng 2017-02-06 11:20:11 +08:00 committed by Gary Helmling
parent c55fce00f3
commit d8f3c6cff9
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
View File

@ -1334,6 +1334,10 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
*/ */
@Override @Override
public boolean checkOOME(final Throwable e) { public boolean checkOOME(final Throwable e) {
return exitIfOOME(e);
}
public static boolean exitIfOOME(final Throwable e ){
boolean stop = false; boolean stop = false;
try { try {
if (e instanceof OutOfMemoryError if (e instanceof OutOfMemoryError
@ -1341,7 +1345,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
|| (e.getMessage() != null && e.getMessage().contains( || (e.getMessage() != null && e.getMessage().contains(
"java.lang.OutOfMemoryError"))) { "java.lang.OutOfMemoryError"))) {
stop = true; stop = true;
LOG.fatal("Run out of memory; " + getClass().getSimpleName() LOG.fatal("Run out of memory; " + RSRpcServices.class.getSimpleName()
+ " will abort itself immediately", e); + " will abort itself immediately", e);
} }
} finally { } finally {

3
hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
View File

@ -53,6 +53,7 @@ import org.apache.hadoop.hbase.MetaTableAccessor;
import org.apache.hadoop.hbase.Stoppable; import org.apache.hadoop.hbase.Stoppable;
import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.regionserver.RSRpcServices;
import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
import org.apache.hadoop.hbase.replication.ChainWALEntryFilter; import org.apache.hadoop.hbase.replication.ChainWALEntryFilter;
import org.apache.hadoop.hbase.replication.ClusterMarkingEntryFilter; import org.apache.hadoop.hbase.replication.ClusterMarkingEntryFilter;
@ -778,8 +779,10 @@ public class ReplicationSource extends Thread implements ReplicationSourceInterf
Thread.UncaughtExceptionHandler handler = new Thread.UncaughtExceptionHandler() { Thread.UncaughtExceptionHandler handler = new Thread.UncaughtExceptionHandler() {
@Override @Override
public void uncaughtException(final Thread t, final Throwable e) { public void uncaughtException(final Thread t, final Throwable e) {
RSRpcServices.exitIfOOME(e);
LOG.error("Unexpected exception in ReplicationSourceWorkerThread," + " currentPath=" LOG.error("Unexpected exception in ReplicationSourceWorkerThread," + " currentPath="
+ getCurrentPath(), e); + getCurrentPath(), e);
stopper.stop("Unexpected exception in ReplicationSourceWorkerThread");
} }
}; };
Threads.setDaemonThreadRunning(this, n + ".replicationSource." + walGroupId + "," Threads.setDaemonThreadRunning(this, n + ".replicationSource." + walGroupId + ","