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

HBASE-10651 Fix incorrect handling of IE that restores current thread's interrupt status within while/for loops in Replication (Honghua Feng) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1575605 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2014-03-08 20:41:32 +00:00
parent ae1abc8b1b
commit 6dab763850
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -710,6 +710,9 @@ public class ReplicationSource extends Thread
} catch (InterruptedException e) {
LOG.debug("Interrupted while sleeping for throttling control");
Thread.currentThread().interrupt();
// current thread might be interrupted to terminate
// directly go back to while() for confirm this
continue;
}
// reset throttler's cycle start tick when sleep for throttling occurs
this.throttler.resetStartTick();
@ -753,6 +756,11 @@ public class ReplicationSource extends Thread
+ "Replication cannot proceed without losing data.", sleepMultiplier)) {
sleepMultiplier++;
}
// current thread might be interrupted to terminate
// directly go back to while() for confirm this
if (isInterrupted()) {
continue;
}
}
} else {
if (ioe instanceof SocketTimeoutException) {
@ -763,6 +771,11 @@ public class ReplicationSource extends Thread
"call to the remote cluster timed out, which is usually " +
"caused by a machine failure or a massive slowdown",
this.socketTimeoutMultiplier);
// current thread might be interrupted to terminate
// directly go back to while() for confirm this
if (isInterrupted()) {
continue;
}
} else if (ioe instanceof ConnectException) {
LOG.warn("Peer is unavailable, rechecking all sinks: ", ioe);
replicationSinkMgr.chooseSinks();
@ -849,7 +862,8 @@ public class ReplicationSource extends Thread
+ " because an error occurred: " + reason, cause);
}
this.running = false;
Threads.shutdown(this, this.sleepForRetries);
this.interrupt();
Threads.shutdown(this, this.sleepForRetries * this.maxRetriesMultiplier);
}
public String getPeerClusterZnode() {
@ -865,7 +879,7 @@ public class ReplicationSource extends Thread
}
private boolean isActive() {
return !this.stopper.isStopped() && this.running;
return !this.stopper.isStopped() && this.running && !isInterrupted();
}
/**