Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-2958 Timed out waiting pool stop on backup restart 

BackupManager::activated should correctly unblock
unauthorized blocking requests to allow a backup broker
to prompty restart in case of live failback
This commit is contained in:
franz1981 2020-10-22 11:01:09 +02:00 committed by Clebert Suconic
parent 2491bafcce
commit b5753a0000
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
View File

@ -643,6 +643,10 @@ public final class ChannelImpl implements Channel {
unlock(); unlock();
} }
closed = true; closed = true;
// unblock any blocked call:
// don't move this one before closed = true, because
// unblocked calls need to check if (closed) to "gracefully" shutdown.
returnBlocking();
} }
@Override @Override

6
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java
View File

@ -192,9 +192,9 @@ public class BackupManager implements ActiveMQComponent {
private TransportConfiguration connector; private TransportConfiguration connector;
protected long retryInterval; protected long retryInterval;
private ClusterManager clusterManager; private ClusterManager clusterManager;
private boolean stopping = false; private volatile boolean stopping = false;
private boolean announcingBackup; private volatile boolean announcingBackup;
private boolean backupAnnounced = false; private volatile boolean backupAnnounced = false;
@Override @Override
public String toString() { public String toString() {