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

HBASE-25012 HBASE-24359 causes replication missed log of some RemoteException (#2384) 

Signed-off-by: Guanghao Zhang <zghao@apache.org>
This commit is contained in:
XinSun 2020-09-16 18:01:55 +08:00 committed by GitHub
parent c5ca191921
commit a918bf0d7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.java
View File

@ -542,6 +542,7 @@ public class HBaseInterClusterReplicationEndpoint extends HBaseReplicationEndpoi
parallelReplicate(pool, replicateContext, batches); parallelReplicate(pool, replicateContext, batches);
return true; return true;
} catch (IOException ioe) { } catch (IOException ioe) {
if (ioe instanceof RemoteException) {
if (dropOnDeletedTables && isTableNotFoundException(ioe)) { if (dropOnDeletedTables && isTableNotFoundException(ioe)) {
// Only filter the edits to replicate and don't change the entries in replicateContext // Only filter the edits to replicate and don't change the entries in replicateContext
// as the upper layer rely on it. // as the upper layer rely on it.
@ -553,10 +554,15 @@ public class HBaseInterClusterReplicationEndpoint extends HBaseReplicationEndpoi
} else if (dropOnDeletedColumnFamilies && isNoSuchColumnFamilyException(ioe)) { } else if (dropOnDeletedColumnFamilies && isNoSuchColumnFamilyException(ioe)) {
batches = filterNotExistColumnFamilyEdits(batches); batches = filterNotExistColumnFamilyEdits(batches);
if (batches.isEmpty()) { if (batches.isEmpty()) {
LOG.warn( LOG.warn("After filter not exist column family's edits, 0 edits to replicate, " +
"After filter not exist column family's edits, 0 edits to replicate, just return"); "just return");
return true; return true;
} }
} else {
LOG.warn("{} Peer encountered RemoteException, rechecking all sinks: ", logPeerId(),
ioe);
replicationSinkMgr.chooseSinks();
}
} else { } else {
if (ioe instanceof SocketTimeoutException) { if (ioe instanceof SocketTimeoutException) {
// This exception means we waited for more than 60s and nothing // This exception means we waited for more than 60s and nothing