Added the storage of QoS1 messages for not clean sessions and the refire once the client reconnects

This commit is contained in:
selva.andre
2012-09-01 12:33:06 +02:00
parent 599afa76e6
commit e5fbf5c655
5 changed files with 83 additions and 11 deletions
@@ -47,4 +47,6 @@ public interface IMessaging {
void disconnect(IoSession session); void disconnect(IoSession session);
void refill(MessagingEvent evt) throws InterruptedException; void refill(MessagingEvent evt) throws InterruptedException;
void republishStored(String clientID);
} }
@@ -4,6 +4,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.text.ParseException; import java.text.ParseException;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
@@ -62,6 +63,8 @@ public class SimpleMessaging implements IMessaging, Runnable {
private SortedIndex<String, StoredMessage> m_retainedStore; private SortedIndex<String, StoredMessage> m_retainedStore;
//bind clientID+MsgID -> evt message published //bind clientID+MsgID -> evt message published
private SortedIndex<String, PublishEvent> m_inflightStore; private SortedIndex<String, PublishEvent> m_inflightStore;
//maps clientID to the list of pending messages stored
private SortedIndex<String, List<PublishEvent>> m_persistentMessageStore;
public SimpleMessaging() { public SimpleMessaging() {
String storeFile = Server.STORAGE_FILE_PATH; String storeFile = Server.STORAGE_FILE_PATH;
@@ -82,6 +85,8 @@ public class SimpleMessaging implements IMessaging, Runnable {
subscriptions.init(m_multiIndexFactory); subscriptions.init(m_multiIndexFactory);
initRetainedMessageStore(); initRetainedMessageStore();
initInflightMessageStore();
//init the message store for QoS 1/2 messages in clean sessions
initPersistentMessageStore(); initPersistentMessageStore();
} }
@@ -95,24 +100,28 @@ public class SimpleMessaging implements IMessaging, Runnable {
/** /**
* Initialize the message store used to handle the temporary storage of QoS 1,2 * Initialize the message store used to handle the temporary storage of QoS 1,2
* messages. * messages in flight.
*/ */
private void initPersistentMessageStore() { private void initInflightMessageStore() {
BTreeIndexFactory<String, PublishEvent> indexFactory = new BTreeIndexFactory<String, PublishEvent>(); BTreeIndexFactory<String, PublishEvent> indexFactory = new BTreeIndexFactory<String, PublishEvent>();
indexFactory.setKeyCodec(StringCodec.INSTANCE); indexFactory.setKeyCodec(StringCodec.INSTANCE);
m_inflightStore = (SortedIndex<String, PublishEvent>) m_multiIndexFactory.openOrCreate("inflight", indexFactory); m_inflightStore = (SortedIndex<String, PublishEvent>) m_multiIndexFactory.openOrCreate("inflight", indexFactory);
} }
private void initPersistentMessageStore() {
BTreeIndexFactory<String, List<PublishEvent>> indexFactory = new BTreeIndexFactory<String, List<PublishEvent>>();
indexFactory.setKeyCodec(StringCodec.INSTANCE);
m_persistentMessageStore = (SortedIndex<String, List<PublishEvent>>) m_multiIndexFactory.openOrCreate("persistedMessages", indexFactory);
}
public void run() { public void run() {
eventLoop(); eventLoop();
} }
public void publish(String topic, byte[] message, QOSType qos, boolean retain, String clientID, IoSession session) { public void publish(String topic, byte[] message, QOSType qos, boolean retain, String clientID, IoSession session) {
//TODO for this moment no qos > 0 trivial implementation
// QOSType defQos = QOSType.MOST_ONE;
try { try {
m_inboundQueue.put(new PublishEvent(topic, qos, message, retain, clientID, session)); m_inboundQueue.put(new PublishEvent(topic, qos, message, retain, clientID, session));
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
@@ -161,6 +170,15 @@ public class SimpleMessaging implements IMessaging, Runnable {
m_inboundQueue.put(evt); m_inboundQueue.put(evt);
} }
public void republishStored(String clientID) {
//create the event to push
try {
m_inboundQueue.put(new RepublishEvent(clientID));
} catch (InterruptedException iex) {
LOG.error(null, iex);
}
}
/** /**
* Verify if the 2 topics matching respecting the rules of MQTT Appendix A * Verify if the 2 topics matching respecting the rules of MQTT Appendix A
*/ */
@@ -237,11 +255,12 @@ public class SimpleMessaging implements IMessaging, Runnable {
} else if (evt instanceof CloseEvent) { } else if (evt instanceof CloseEvent) {
processClose(); processClose();
} else if (evt instanceof DisconnectEvent) { } else if (evt instanceof DisconnectEvent) {
m_outboundQueue.put(evt); processDisconnect((DisconnectEvent) evt);
} else if (evt instanceof CleanInFlightEvent) { } else if (evt instanceof CleanInFlightEvent) {
//remove the message from inflight storage //remove the message from inflight storage
m_inflightStore.remove(((CleanInFlightEvent)evt).getMsgId()); m_inflightStore.remove(((CleanInFlightEvent)evt).getMsgId());
} else if (evt instanceof RepublishEvent) {
processRepublish((RepublishEvent) evt);
} }
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
processClose(); processClose();
@@ -273,6 +292,17 @@ public class SimpleMessaging implements IMessaging, Runnable {
} else { } else {
//QoS 1 or 2 //QoS 1 or 2
//if the target subscription is not clean session and is not connected => store it //if the target subscription is not clean session and is not connected => store it
if (!sub.isCleanSession() && !sub.isActive()) {
List<PublishEvent> storedEvents;
String clientID = evt.getClientID();
if (!m_persistentMessageStore.containsKey(clientID)) {
storedEvents = new ArrayList<PublishEvent>();
} else {
storedEvents = m_persistentMessageStore.get(clientID);
}
storedEvents.add(evt);
m_persistentMessageStore.put(clientID, storedEvents);
}
m_outboundQueue.put(new NotifyEvent(sub.clientId, topic, qos, message, false, evt.getMessageID())); m_outboundQueue.put(new NotifyEvent(sub.clientId, topic, qos, message, false, evt.getMessageID()));
} }
} }
@@ -326,6 +356,17 @@ public class SimpleMessaging implements IMessaging, Runnable {
protected void processRemoveAllSubscriptions(RemoveAllSubscriptionsEvent evt) { protected void processRemoveAllSubscriptions(RemoveAllSubscriptionsEvent evt) {
LOG.debug("processRemoveAllSubscriptions invoked"); LOG.debug("processRemoveAllSubscriptions invoked");
subscriptions.removeForClient(evt.getClientID()); subscriptions.removeForClient(evt.getClientID());
//remove also the messages stored of type QoS1/2
m_persistentMessageStore.remove(evt.getClientID());
}
private void processDisconnect(DisconnectEvent evt) throws InterruptedException {
m_outboundQueue.put(evt);
//de-activate the subscriptions for this ClientID
String clientID = (String) evt.getSession().getAttribute(Constants.ATTR_CLIENTID);
subscriptions.disconnect(clientID);
} }
private void processClose() { private void processClose() {
@@ -336,4 +377,16 @@ public class SimpleMessaging implements IMessaging, Runnable {
LOG.error(null, ex); LOG.error(null, ex);
} }
} }
private void processRepublish(RepublishEvent evt) throws InterruptedException {
List<PublishEvent> publishedEvents = m_persistentMessageStore.get(evt.getClientID());
if (publishedEvents == null) {
return;
}
for (PublishEvent pubEvt : publishedEvents) {
m_outboundQueue.put(new NotifyEvent(pubEvt.getClientID(), pubEvt.getTopic(), pubEvt.getQos(),
pubEvt.getMessage(), false, pubEvt.getMessageID()));
}
}
} }
@@ -0,0 +1,16 @@
package org.dna.mqtt.moquette.messaging.spi.impl.events;
/**
* Used to re-fire stored QoS1 QoS2 events once a client reconnects.
*/
public class RepublishEvent extends MessagingEvent {
private String m_clientID;
public RepublishEvent(String clientID) {
this.m_clientID = clientID;
}
public String getClientID() {
return m_clientID;
}
}
@@ -4,6 +4,6 @@ package org.dna.mqtt.moquette.server;
* Server constants keeper * Server constants keeper
*/ */
public class Constants { public class Constants {
protected static final String ATTR_CLIENTID = "ClientID"; public static final String ATTR_CLIENTID = "ClientID";
public static final String CLEAN_SESSION = "cleanSession"; public static final String CLEAN_SESSION = "cleanSession";
} }
@@ -130,13 +130,14 @@ public class MQTTHandler extends IoHandlerAdapter implements INotifier {
} }
} }
//TODO for QoS1 and QoS remember to store all the messages arrived to
//the dormat subscriptionsonce the QoS1 and QoS2
//handle clean session flag //handle clean session flag
if (msg.isCleanSession()) { if (msg.isCleanSession()) {
//remove all prev subscriptions //remove all prev subscriptions
//cleanup topic subscriptions //cleanup topic subscriptions
m_messaging.removeSubscriptions(msg.getClientID()); m_messaging.removeSubscriptions(msg.getClientID());
} else {
//force the republish of stored QoS1 and QoS2
m_messaging.republishStored(msg.getClientID());
} }
ConnAckMessage okResp = new ConnAckMessage(); ConnAckMessage okResp = new ConnAckMessage();