Skip to content

Commit

Permalink
HBASE-27368 Do not need to throw IllegalStateException when peer is n…
Browse files Browse the repository at this point in the history
…ot active in ReplicationSource.initialize (apache#4779)

Signed-off-by: Xin Sun <[email protected]>
  • Loading branch information
Apache9 authored Sep 15, 2022
1 parent 00aba9c commit 460bb47
Showing 1 changed file with 8 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ WALEntryFilter getWalEntryFilter() {
return walEntryFilter;
}

protected final void uncaughtException(Thread t, Throwable e, ReplicationSourceManager manager,
private void uncaughtException(Thread t, Throwable e, ReplicationSourceManager manager,
String peerId) {
OOMEChecker.exitIfOOME(e, getClass().getSimpleName());
LOG.error("Unexpected exception in {} currentPath={}", t.getName(), getCurrentPath(), e);
Expand Down Expand Up @@ -539,15 +539,10 @@ private void initialize() {
}

if (!this.isSourceActive()) {
// this means the server is shutting down or the source is terminated, just give up
// initializing
setSourceStartupStatus(false);
if (Thread.currentThread().isInterrupted()) {
// If source is not running and thread is interrupted this means someone has tried to
// remove this peer.
return;
}

retryStartup.set(!this.abortOnError);
throw new IllegalStateException("Source should be active.");
return;
}

sleepMultiplier = 1;
Expand All @@ -569,15 +564,12 @@ private void initialize() {
}

if (!this.isSourceActive()) {
// this means the server is shutting down or the source is terminated, just give up
// initializing
setSourceStartupStatus(false);
if (Thread.currentThread().isInterrupted()) {
// If source is not running and thread is interrupted this means someone has tried to
// remove this peer.
return;
}
retryStartup.set(!this.abortOnError);
throw new IllegalStateException("Source should be active.");
return;
}

LOG.info("{} queueId={} (queues={}) is replicating from cluster={} to cluster={}", logPeerId(),
this.replicationQueueInfo.getQueueId(), logQueue.getNumQueues(), clusterId, peerClusterId);
initializeWALEntryFilter(peerClusterId);
Expand Down

0 comments on commit 460bb47

Please sign in to comment.