Merge pull request #92 from m-chrzan/gossip-girl-2

Finish gossip girl

4 files changed, 259 insertions, 31 deletions

diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/HejkaMessage.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/HejkaMessage.java
index 340d939..62554a5 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/HejkaMessage.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/HejkaMessage.java
@@ -8,12 +8,16 @@ import pl.edu.mimuw.cloudatlas.model.ValueTime;
 
 public class HejkaMessage extends RemoteGossipGirlMessage {
     private long senderGossipId;
+    private PathName senderPath;
+    private PathName receiverPath;
     private Map<PathName, ValueTime> zoneTimestamps;
     private Map<Attribute, ValueTime> queryTimestamps;
 
-    public HejkaMessage(String messageId, long timestamp, long senderGossipId, Map<PathName, ValueTime> zoneTimestamps, Map<Attribute, ValueTime> queryTimestamps) {
+    public HejkaMessage(String messageId, long timestamp, long senderGossipId, PathName senderPath, PathName receiverPath, Map<PathName, ValueTime> zoneTimestamps, Map<Attribute, ValueTime> queryTimestamps) {
         super(messageId, timestamp, Type.HEJKA);
         this.senderGossipId = senderGossipId;
+        this.senderPath = senderPath;
+        this.receiverPath = receiverPath;
         this.zoneTimestamps = zoneTimestamps;
         this.queryTimestamps = queryTimestamps;
     }
@@ -22,6 +26,14 @@ public class HejkaMessage extends RemoteGossipGirlMessage {
         return senderGossipId;
     }
 
+    public PathName getSenderPath() {
+        return senderPath;
+    }
+
+    public PathName getReceiverPath() {
+        return receiverPath;
+    }
+
     public Map<PathName, ValueTime> getZoneTimestamps() {
         return zoneTimestamps;
     }
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/NoCoTamMessage.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/NoCoTamMessage.java
index 3dd0c4d..c23722c 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/NoCoTamMessage.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/NoCoTamMessage.java
@@ -14,7 +14,7 @@ public class NoCoTamMessage extends RemoteGossipGirlMessage {
     private ValueTime hejkaSendTimestamp;
     private ValueTime hejkaReceiveTimestamp;
 
-    public NoCoTamMessage(String messageId, long timestamp, long receiverGossipId, long senderGossipId, Map<PathName, ValueTime> zoneTimestamps, Map<Attribute, ValueTime> queryTimestamps, ValueTime hejkaSendTimestamp, ValueTime hejkaReceiveTimestamp) {
+    public NoCoTamMessage(String messageId, long timestamp, long senderGossipId, long receiverGossipId, Map<PathName, ValueTime> zoneTimestamps, Map<Attribute, ValueTime> queryTimestamps, ValueTime hejkaSendTimestamp, ValueTime hejkaReceiveTimestamp) {
         super(messageId, timestamp, Type.NO_CO_TAM);
         this.receiverGossipId = receiverGossipId;
         this.senderGossipId = senderGossipId;
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirl.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirl.java
index 73aef8b..dd8f0b7 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirl.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirl.java
@@ -1,5 +1,6 @@
 package pl.edu.mimuw.cloudatlas.agent.modules;
 
+import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -14,9 +15,12 @@ import pl.edu.mimuw.cloudatlas.agent.messages.QueryMessage;
 import pl.edu.mimuw.cloudatlas.agent.messages.ResponseMessage;
 import pl.edu.mimuw.cloudatlas.agent.messages.StateMessage;
 import pl.edu.mimuw.cloudatlas.agent.messages.UDUPMessage;
+import pl.edu.mimuw.cloudatlas.agent.messages.UpdateAttributesMessage;
+import pl.edu.mimuw.cloudatlas.agent.messages.UpdateQueriesMessage;
 import pl.edu.mimuw.cloudatlas.model.Attribute;
 import pl.edu.mimuw.cloudatlas.model.AttributesMap;
 import pl.edu.mimuw.cloudatlas.model.PathName;
+import pl.edu.mimuw.cloudatlas.model.ValueContact;
 import pl.edu.mimuw.cloudatlas.model.ValueQuery;
 import pl.edu.mimuw.cloudatlas.model.ValueTime;
 import pl.edu.mimuw.cloudatlas.model.ZMI;
@@ -35,9 +39,18 @@ public class GossipGirl extends Module {
             case INITIATE:
                 initiateGossip((InitiateGossipMessage) message);
                 break;
+            case HEJKA:
+                receiveGossip((HejkaMessage) message);
+                break;
             case NO_CO_TAM:
                 handleNoCoTam((NoCoTamMessage) message);
                 break;
+            case ATTRIBUTES:
+                handleAttributes((AttributesMessage) message);
+                break;
+            case QUERY:
+                handleQuery((QueryMessage) message);
+                break;
             default:
                 throw new InvalidMessageType("This type of message cannot be handled by GossipGirl");
         }
@@ -62,6 +75,23 @@ public class GossipGirl extends Module {
         sendMessage(getState);
     }
 
+    private void receiveGossip(HejkaMessage message) throws InterruptedException {
+        Long gossipId = nextGossipId;
+        nextGossipId++;
+        gossipStates.put(gossipId, new GossipGirlState(
+                    gossipId,
+                    message.getReceiverPath(),
+                    new ValueContact(message.getSenderPath(), message.getSenderAddress()),
+                    false
+                )
+        );
+
+        gossipStates.get(gossipId).handleHejka(message);
+
+        GetStateMessage getState = new GetStateMessage("", 0, ModuleType.GOSSIP, gossipId);
+        sendMessage(getState);
+    }
+
     private void setState(StateMessage message) throws InterruptedException {
         GossipGirlState state = gossipStates.get(message.getRequestId());
         if (state != null) {
@@ -71,12 +101,28 @@ public class GossipGirl extends Module {
                         "",
                         0,
                         state.gossipId,
+                        state.ourPath,
+                        state.theirContact.getName(),
                         state.getZoneTimestampsToSend(),
                         state.getQueryTimestampsToSend()
                 );
                 UDUPMessage udupMessage = new UDUPMessage("", 0, state.theirContact, hejka);
                 sendMessage(udupMessage);
                 state.sentHejka();
+            } else if (state.state == GossipGirlState.State.SEND_NO_CO_TAM) {
+                NoCoTamMessage noCoTam = new NoCoTamMessage(
+                        "",
+                        0,
+                        state.gossipId,
+                        state.theirGossipId,
+                        state.getZoneTimestampsToSend(),
+                        state.getQueryTimestampsToSend(),
+                        state.hejkaSendTimestamp,
+                        state.hejkaReceiveTimestamp
+                );
+                UDUPMessage udupMessage = new UDUPMessage("", 0, state.theirContact, noCoTam);
+                sendMessage(udupMessage);
+                state.sentNoCoTam();
             }
         } else {
             System.out.println("ERROR: GossipGirl got state for a nonexistent gossip");
@@ -87,20 +133,60 @@ public class GossipGirl extends Module {
         GossipGirlState state = gossipStates.get(message.getReceiverGossipId());
         if (state != null) {
             state.handleNoCoTam(message);
-            for (ZMI zmi : state.getZMIsToSend()) {
-                AttributesMessage attributesMessage = new AttributesMessage("", 0, zmi.getPathName(), zmi.getAttributes(), state.theirGossipId);
-                UDUPMessage udupMessage = new UDUPMessage("", 0, state.theirContact, attributesMessage);
-                sendMessage(udupMessage);
+            sendInfo(state);
+        } else {
+            System.out.println("ERROR: GossipGirl got state for a nonexistent gossip");
+        }
+    }
+
+    private void sendInfo(GossipGirlState state) throws InterruptedException {
+        for (ZMI zmi : state.getZMIsToSend()) {
+            AttributesMessage attributesMessage = new AttributesMessage("", 0, zmi.getPathName(), zmi.getAttributes(), state.theirGossipId);
+            UDUPMessage udupMessage = new UDUPMessage("", 0, state.theirContact, attributesMessage);
+            sendMessage(udupMessage);
+        }
+
+        for (Entry<Attribute, ValueQuery> query : state.getQueriesToSend()) {
+            QueryMessage queryMessage = new QueryMessage("", 0, query.getKey(), query.getValue(), state.theirGossipId);
+            UDUPMessage udupMessage = new UDUPMessage("", 0, state.theirContact, queryMessage);
+            sendMessage(udupMessage);
+        }
+        state.sentInfo();
+    }
+
+    private void handleAttributes(AttributesMessage message) throws InterruptedException {
+        GossipGirlState state = gossipStates.get(message.getReceiverGossipId());
+        if (state != null) {
+            state.gotAttributes(message);
+            if (state.state == GossipGirlState.State.SEND_INFO) {
+                sendInfo(state);
+            }
+            UpdateAttributesMessage updateMessage = new UpdateAttributesMessage("", 0, message.getPath().toString(), message.getAttributes());
+            sendMessage(updateMessage);
+            if (state.state == GossipGirlState.State.FINISHED) {
+                gossipStates.remove(message.getReceiverGossipId());
             }
+        } else {
+            System.out.println("ERROR: GossipGirl got attributes for a nonexistent gossip");
+        }
+    }
 
-            for (Entry<Attribute, ValueQuery> query : state.getQueriesToSend()) {
-                QueryMessage queryMessage = new QueryMessage("", 0, query.getKey(), query.getValue(), state.theirGossipId);
-                UDUPMessage udupMessage = new UDUPMessage("", 0, state.theirContact, queryMessage);
-                sendMessage(udupMessage);
+    private void handleQuery(QueryMessage message) throws InterruptedException {
+        GossipGirlState state = gossipStates.get(message.getReceiverGossipId());
+        if (state != null) {
+            state.gotQuery(message.getName());
+            Map<Attribute, Entry<ValueQuery, ValueTime>> queries = new HashMap();
+            queries.put(
+                message.getName(),
+                new SimpleImmutableEntry(message.getQuery(), state.getTheirQueryTimestamp(message.getName()))
+            );
+            UpdateQueriesMessage updateMessage = new UpdateQueriesMessage("", 0, queries);
+            sendMessage(updateMessage);
+            if (state.state == GossipGirlState.State.FINISHED) {
+                gossipStates.remove(message.getReceiverGossipId());
             }
-            state.sentInfo();
         } else {
-            System.out.println("ERROR: GossipGirl got state for a nonexistent gossip");
+            System.out.println("ERROR: GossipGirl got query for a nonexistent gossip");
         }
     }
 }
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlState.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlState.java
index df17957..eafbcca 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlState.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlState.java
@@ -2,12 +2,16 @@ package pl.edu.mimuw.cloudatlas.agent.modules;
 
 import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
+import pl.edu.mimuw.cloudatlas.agent.messages.AttributesMessage;
+import pl.edu.mimuw.cloudatlas.agent.messages.HejkaMessage;
 import pl.edu.mimuw.cloudatlas.agent.messages.NoCoTamMessage;
 import pl.edu.mimuw.cloudatlas.model.Attribute;
 import pl.edu.mimuw.cloudatlas.model.PathName;
@@ -20,12 +24,16 @@ import pl.edu.mimuw.cloudatlas.model.ZMI;
 public class GossipGirlState {
     public enum State {
         WAIT_FOR_STATE_INITIALIZER,
+        APPLY_HEJKA,
         WAIT_FOR_STATE_RESPONDER,
         SEND_HEJKA,
+        SEND_NO_CO_TAM,
         SEND_INFO,
+        SEND_INFO_AND_FINISH,
         WAIT_FOR_NO_CO_TAM,
         WAIT_FOR_FIRST_INFO,
         WAIT_FOR_INFO,
+        FINISHED,
         ERROR
     }
     public PathName ourPath;
@@ -42,6 +50,10 @@ public class GossipGirlState {
     public ValueTime noCoTamSendReceiveTimestamp;
     private Map<PathName, ValueTime> theirZoneTimestamps;
     private Map<Attribute, ValueTime> theirQueryTimestamps;
+    private List<PathName> zonesToSend;
+    private List<Attribute> queriesToSend;
+    private Set<PathName> waitingForZones;
+    private Set<Attribute> waitingForQueries;
 
     public GossipGirlState(long gossipId, PathName ourPath, ValueContact theirContact, boolean initiating) {
         this.gossipId = gossipId;
@@ -50,7 +62,7 @@ public class GossipGirlState {
         if (initiating) {
             state = State.WAIT_FOR_STATE_INITIALIZER;
         } else {
-            state = State.WAIT_FOR_STATE_RESPONDER;
+            state = State.APPLY_HEJKA;
         }
     }
 
@@ -64,7 +76,7 @@ public class GossipGirlState {
             case WAIT_FOR_STATE_RESPONDER:
                 this.hierarchy = hierarchy;
                 this.queries = queries;
-                state = State.WAIT_FOR_FIRST_INFO;
+                state = State.SEND_NO_CO_TAM;
                 break;
             default:
                 System.out.println("ERROR: tried to set gossip state when not expected");
@@ -83,6 +95,33 @@ public class GossipGirlState {
         }
     }
 
+    public void sentNoCoTam() {
+        switch (state) {
+            case SEND_NO_CO_TAM:
+                state = state.WAIT_FOR_FIRST_INFO;
+                break;
+            default:
+                System.out.println("ERROR: tried to set gossip state when not expected");
+                state = State.ERROR;
+        }
+    }
+
+    public void handleHejka(HejkaMessage message) {
+        switch (state) {
+            case APPLY_HEJKA:
+                theirGossipId = message.getSenderGossipId();
+                theirZoneTimestamps = message.getZoneTimestamps();
+                theirQueryTimestamps = message.getQueryTimestamps();
+                hejkaSendTimestamp = message.getSentTimestamp();
+                hejkaReceiveTimestamp = message.getReceivedTimestamp();
+                state = State.WAIT_FOR_STATE_RESPONDER;
+                break;
+            default:
+                System.out.println("ERROR: tried to set gossip state when not expected");
+                state = State.ERROR;
+        }
+    }
+
     public void handleNoCoTam(NoCoTamMessage message) {
         switch (state) {
             case WAIT_FOR_NO_CO_TAM:
@@ -91,6 +130,9 @@ public class GossipGirlState {
                 theirQueryTimestamps = message.getQueryTimestamps();
                 hejkaSendTimestamp = message.getHejkaSendTimestamp();
                 hejkaReceiveTimestamp = message.getHejkaReceiveTimestamp();
+                setZonesToSend();
+                setQueriesToSend();
+                setWaitingFor();
                 state = State.SEND_INFO;
                 break;
             default:
@@ -99,6 +141,25 @@ public class GossipGirlState {
         }
     }
 
+    private void setWaitingFor() {
+        setWaitingForZones();
+        setWaitingForQueries();
+    }
+
+    private void setWaitingForZones() {
+        waitingForZones = new HashSet(theirZoneTimestamps.keySet());
+        for (PathName path : zonesToSend) {
+            waitingForZones.remove(path);
+        }
+    }
+
+    private void setWaitingForQueries() {
+        waitingForQueries = new HashSet(theirQueryTimestamps.keySet());
+        for (Attribute name : queriesToSend) {
+            waitingForQueries.remove(name);
+        }
+    }
+
     public Map<PathName, ValueTime> getZoneTimestampsToSend() {
         Map<PathName, ValueTime> timestamps = new HashMap();
         collectZoneTimestamps(timestamps, hierarchy, theirContact.getName());
@@ -114,35 +175,48 @@ public class GossipGirlState {
         return queryTimestamps;
     }
 
-    public List<ZMI> getZMIsToSend() {
-        List<ZMI> zmis = new LinkedList();
+    public void setZonesToSend() {
+        zonesToSend = new LinkedList();
         for (Entry<PathName, ValueTime> timestampedPath : getZoneTimestampsToSend().entrySet()) {
             ValueTime theirTimestamp = theirZoneTimestamps.get(timestampedPath.getKey());
             if (theirTimestamp == null || ValueUtils.valueLower(theirTimestamp, timestampedPath.getValue())) {
-                System.out.println("going to send " + timestampedPath.getKey().toString());
-                try {
-                    zmis.add(hierarchy.findDescendant(timestampedPath.getKey()));
-                } catch (ZMI.NoSuchZoneException e) {
-                    System.out.println("ERROR: didn't find a zone we wanted to send in getZMIsToSend");
-                }
+                zonesToSend.add(timestampedPath.getKey());
             }
         }
-        return zmis;
     }
 
-    public List<Entry<Attribute, ValueQuery>> getQueriesToSend() {
-        List<Entry<Attribute, ValueQuery>> queryList = new LinkedList();
+    public void setQueriesToSend() {
+        queriesToSend = new LinkedList();
         for (Entry<Attribute, ValueTime> timestampedQuery : getQueryTimestampsToSend().entrySet()) {
             ValueTime theirTimestamp = theirQueryTimestamps.get(timestampedQuery.getKey());
             if (theirTimestamp == null || ValueUtils.valueLower(theirTimestamp, timestampedQuery.getValue())) {
-                queryList.add(
-                    new SimpleImmutableEntry(
-                        timestampedQuery.getKey(),
-                        queries.get(timestampedQuery.getKey()).getKey()
-                    )
-                );
+                queriesToSend.add(timestampedQuery.getKey());
             }
         }
+    }
+
+    public List<ZMI> getZMIsToSend() {
+        List<ZMI> zmis = new LinkedList();
+        for (PathName path : zonesToSend) {
+            try {
+                zmis.add(hierarchy.findDescendant(path));
+            } catch (ZMI.NoSuchZoneException e) {
+                System.out.println("ERROR: didn't find a zone we wanted to send in getZMIsToSend");
+            }
+        }
+        return zmis;
+    }
+
+    public List<Entry<Attribute, ValueQuery>> getQueriesToSend() {
+        List<Entry<Attribute, ValueQuery>> queryList = new LinkedList();
+        for (Attribute name : queriesToSend) {
+            queryList.add(
+                new SimpleImmutableEntry(
+                    name,
+                    queries.get(name).getKey()
+                )
+            );
+        }
         return queryList;
     }
 
@@ -189,9 +263,65 @@ public class GossipGirlState {
             case SEND_INFO:
                 state = State.WAIT_FOR_INFO;
                 break;
+            case SEND_INFO_AND_FINISH:
+                state = State.FINISHED;
+                break;
             default:
                 System.out.println("ERROR: tried to set gossip state when not expected");
                 state = State.ERROR;
         }
     }
+
+    public void gotAttributes(AttributesMessage message) {
+        switch (state) {
+            case WAIT_FOR_INFO:
+                if (!waitingForZones.remove(message.getPath())) {
+                    System.out.println("DEBUG: got zone attributes we weren't expecting");
+                }
+                if (waitingForZones.isEmpty() && waitingForQueries.isEmpty()) {
+                    System.out.println("INFO: done waiting for info");
+                    state = state.FINISHED;
+                }
+                break;
+            case WAIT_FOR_FIRST_INFO:
+                // TODO: use offset to setup GTP
+                setZonesToSend();
+                setQueriesToSend();
+                setWaitingFor();
+                state = State.SEND_INFO;
+
+                if (!waitingForZones.remove(message.getPath())) {
+                    System.out.println("DEBUG: got zone attributes we weren't expecting");
+                }
+                if (waitingForZones.isEmpty() && waitingForQueries.isEmpty()) {
+                    System.out.println("INFO: done waiting for info");
+                    state = state.SEND_INFO_AND_FINISH;
+                }
+                break;
+            default:
+                System.out.println("ERROR: got attributes when not expected");
+                state = State.ERROR;
+        }
+    }
+
+    public void gotQuery(Attribute name) {
+        switch (state) {
+            case WAIT_FOR_INFO:
+                if (!waitingForQueries.remove(name)) {
+                    System.out.println("DEBUG: got query we weren't expecting");
+                }
+                if (waitingForZones.isEmpty() && waitingForQueries.isEmpty()) {
+                    System.out.println("INFO: done waiting for info");
+                    state = state.FINISHED;
+                }
+                break;
+            default:
+                System.out.println("ERROR: got query when not expected");
+                state = State.ERROR;
+        }
+    }
+
+    public ValueTime getTheirQueryTimestamp(Attribute name) {
+        return theirQueryTimestamps.get(name);
+    }
 }