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

AMQ-8023 - retain sync add call, duplicate sub suppression depends on it, regression in AMQ3274Test

This commit is contained in:
gtully 2020-08-26 14:39:43 +01:00
parent 0e2b24be36
commit c0e6d47121
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
View File

@ -33,6 +33,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
@ -1151,7 +1152,8 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
protected void addSubscription(final DemandSubscription sub) throws IOException {
if (sub != null) {
// Serialize with remove operations such that new sub does not cause remove/purge to fail
serialExecutor.execute(new Runnable() {
// remain synchronous b/c duplicate suppression depends on add completion
FutureTask syncTask = new FutureTask(new Runnable() {
@Override
public void run() {
try {
@ -1161,7 +1163,14 @@ public abstract class DemandForwardingBridgeSupport implements NetworkBridge, Br
LOG.debug("detail", e);
}
}
});
}, null);
try {
serialExecutor.execute(syncTask);
syncTask.get();
} catch (Exception e) {
LOG.warn("failed to execute add sub command: {}, cause: {}", sub.getLocalInfo(), e);
LOG.debug("detail", e);
}
}
}