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

ARTEMIS-4354 Allow the recovery XAResource to close and reconnect the underlying ClientSession if the connection configuration has changed. 

Signed-off-by: Emmanuel Hugonnet <ehugonne@redhat.com>
This commit is contained in:
Emmanuel Hugonnet 2023-07-17 17:55:56 +02:00 committed by clebertsuconic
parent 677d71b8e7
commit 24dde9d4b5
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
View File

@ -67,6 +67,13 @@ public class ActiveMQXAResourceWrapper implements XAResource, SessionFailureList
}
}
public void updateRecoveryConfig(XARecoveryConfig... xaRecoveryConfigs) {
synchronized (ActiveMQXAResourceWrapper.lock) {
close();
this.xaRecoveryConfigs = xaRecoveryConfigs;
}
}
@Override
public Xid[] recover(final int flag) throws XAException {
XAResource xaResource = getDelegate(false);

21
tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/ra/ActiveMQXAResourceWrapperTest.java
View File

@ -17,6 +17,8 @@
package org.apache.activemq.artemis.tests.unit.ra;
import java.util.HashMap;
import java.util.Map;
import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.ra.ActiveMQResourceAdapter;
@ -26,6 +28,8 @@ import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.junit.Test;
import javax.transaction.xa.XAResource;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
public class ActiveMQXAResourceWrapperTest extends ActiveMQTestBase {
@ -45,8 +49,8 @@ public class ActiveMQXAResourceWrapperTest extends ActiveMQTestBase {
ra.setConnectionTTL(4000L);
ra.start(new BootstrapContext());
TestActiveMQXAResourceWrapper wrapper = new TestActiveMQXAResourceWrapper(ra.getRecoveryManager().getResources().toArray(new XARecoveryConfig[]{}));
XARecoveryConfig[] configs = ra.getRecoveryManager().getResources().toArray(new XARecoveryConfig[]{});
TestActiveMQXAResourceWrapper wrapper = new TestActiveMQXAResourceWrapper(configs);
XAResource res = wrapper.connect();
if (!(res instanceof ClientSession)) {
@ -54,7 +58,18 @@ public class ActiveMQXAResourceWrapperTest extends ActiveMQTestBase {
}
cs = (ClientSession) res;
assertEquals(4000L, cs.getSessionFactory().getServerLocator().getConnectionTTL());
Map<String, Object> params = new HashMap<>();
params.put(TransportConstants.HOST_PROP_NAME, "localhost");
params.put(TransportConstants.PORT_PROP_NAME, 61616);
params.put(TransportConstants.CONNECTION_TTL, 60000L);
XARecoveryConfig backup = new XARecoveryConfig(true, new TransportConfiguration[] {new TransportConfiguration(NETTY_CONNECTOR_FACTORY, params)}, null, null, null, configs[0].getClientProtocolManager());
wrapper.updateRecoveryConfig(backup);
res = wrapper.connect();
if (!(res instanceof ClientSession)) {
fail("Unexpected XAResource type");
}
cs = (ClientSession) res;
assertEquals(60000L, cs.getSessionFactory().getServerLocator().getConnectionTTL());
} finally {
if (cs != null)
cs.close();