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

https://issues.apache.org/jira/browse/AMQ-5983 - mqtt virtual topic queue restore

This commit is contained in:
Dejan Bosanac 2015-09-28 13:10:19 +02:00
parent d6682e5476
commit 4a8fec4a66
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/strategy/MQTTVirtualTopicSubscriptionStrategy.java
View File

@ -226,7 +226,7 @@ public class MQTTVirtualTopicSubscriptionStrategy extends AbstractMQTTSubscripti
});
}
} catch (Throwable e) {
LOG.warn("Could not delete the MQTT queue subsscriptions.", e);
LOG.warn("Could not delete the MQTT queue subscriptions.", e);
}
}
@ -274,7 +274,7 @@ public class MQTTVirtualTopicSubscriptionStrategy extends AbstractMQTTSubscripti
final QueueRegion queueRegion = (QueueRegion) regionBroker.getQueueRegion();
for (ActiveMQDestination destination : queueRegion.getDestinationMap().keySet()) {
if (destination.isQueue() && !destination.isTemporary()) {
if (destination.getPhysicalName().startsWith("Consumer." + clientId)) {
if (destination.getPhysicalName().startsWith("Consumer." + clientId + ":")) {
LOG.debug("Recovered client sub: {} on connect", destination.getPhysicalName());
result.add((ActiveMQQueue) destination);
}

48
activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/PahoMQTTTest.java
View File

@ -18,6 +18,9 @@ package org.apache.activemq.transport.mqtt;
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.broker.region.Destination;
import org.apache.activemq.broker.region.RegionBroker;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.util.Wait;
import org.eclipse.paho.client.mqttv3.*;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
@ -350,6 +353,51 @@ public class PahoMQTTTest extends MQTTTestSupport {
assertEquals(0, listener.received);
}
@Test(timeout = 300000)
public void testVirtualTopicQueueRestore() throws Exception {
stopBroker();
protocolConfig = "transport.subscriptionStrategy=mqtt-virtual-topic-subscriptions";
startBroker();
String user10 = "user10";
String password10 = "user10";
String clientId10 = "client-10";
String topic10 = "user10/";
MqttConnectOptions options10 = new MqttConnectOptions();
options10.setCleanSession(false);
options10.setUserName(user10);
options10.setPassword(password10.toCharArray());
MqttClient client10 = createClient(false, clientId10, null);
client10.subscribe(topic10 + clientId10 + "/#", 1);
client10.subscribe(topic10 + "#", 1);
String user1 = "user1";
String password1 = "user1";
String clientId1 = "client-1";
String topic1 = "user1/";
MqttConnectOptions options1 = new MqttConnectOptions();
options1.setCleanSession(false);
options1.setUserName(user1);
options1.setPassword(password1.toCharArray());
MqttClient client1 = createClient(false, clientId1, null);
client1.subscribe(topic1 + clientId1 + "/#", 1);
client1.subscribe(topic1 + "#", 1);
RegionBroker regionBroker = (RegionBroker) brokerService.getBroker().getAdaptor(RegionBroker.class);
String[] queues = new String[]{"Consumer.client-10:AT_LEAST_ONCE.VirtualTopic.user10.>",
"Consumer.client-10:AT_LEAST_ONCE.VirtualTopic.user10.client-10.>",
"Consumer.client-1:AT_LEAST_ONCE.VirtualTopic.user1.>",
"Consumer.client-1:AT_LEAST_ONCE.VirtualTopic.user1.client-1.>"};
for (String queueName : queues) {
Destination queue = regionBroker.getQueueRegion().getDestinations(new ActiveMQQueue(queueName)).iterator().next();
assertEquals("Queue " + queueName + " have more than one consumer", 1, queue.getConsumers().size());
}
}
protected MqttClient createClient(boolean cleanSession, String clientId, MqttCallback listener) throws Exception {
MqttConnectOptions options = new MqttConnectOptions();
options.setCleanSession(cleanSession);