HBASE-25117 ReplicationSourceShipper thread can not be finished (#2521)
Signed-off-by: Wellington Chevreuil <wellington.chevreuil@gmail.com> Signed-off-by: stack <stack@apache.org> Signed-off-by: Guanghao Zhang <zghao@apache.org> Signed-off-by: Duo Zhang <zhangduo@apache.org>
This commit is contained in:
parent
fd0ecadbb9
commit
78b7244091
|
@ -193,7 +193,7 @@ public class HBaseInterClusterReplicationEndpoint extends HBaseReplicationEndpoi
|
|||
* @param sleepMultiplier by how many times the default sleeping time is augmented
|
||||
* @return True if <code>sleepMultiplier</code> is < <code>maxRetriesMultiplier</code>
|
||||
*/
|
||||
protected boolean sleepForRetries(String msg, int sleepMultiplier) {
|
||||
private boolean sleepForRetries(String msg, int sleepMultiplier) {
|
||||
try {
|
||||
if (LOG.isTraceEnabled()) {
|
||||
LOG.trace("{} {}, sleeping {} times {}",
|
||||
|
@ -201,8 +201,9 @@ public class HBaseInterClusterReplicationEndpoint extends HBaseReplicationEndpoi
|
|||
}
|
||||
Thread.sleep(this.sleepForRetries * sleepMultiplier);
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
if (LOG.isDebugEnabled()) {
|
||||
LOG.debug("{} Interrupted while sleeping between retries", logPeerId());
|
||||
LOG.debug("{} {} Interrupted while sleeping between retries", msg, logPeerId());
|
||||
}
|
||||
}
|
||||
return sleepMultiplier < maxRetriesMultiplier;
|
||||
|
|
|
@ -691,6 +691,9 @@ public class ReplicationSource implements ReplicationSourceInterface {
|
|||
}
|
||||
}
|
||||
|
||||
if (this.replicationEndpoint != null) {
|
||||
this.replicationEndpoint.stop();
|
||||
}
|
||||
for (ReplicationSourceShipper worker : workers) {
|
||||
if (worker.isAlive() || worker.entryReader.isAlive()) {
|
||||
try {
|
||||
|
@ -711,9 +714,6 @@ public class ReplicationSource implements ReplicationSourceInterface {
|
|||
}
|
||||
}
|
||||
|
||||
if (this.replicationEndpoint != null) {
|
||||
this.replicationEndpoint.stop();
|
||||
}
|
||||
if (join) {
|
||||
for (ReplicationSourceShipper worker : workers) {
|
||||
Threads.shutdown(worker, this.sleepForRetries);
|
||||
|
|
Loading…
Reference in New Issue