#302 Prepare new protocol

dvoraka · Jan 7, 2018 · 2b5eb12 · 2b5eb12
1 parent 2af1a45
commit 2b5eb12
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/...on/src/main/java/dvoraka/avservice/common/data/replication/DefaultReplicationMessage.java b/...on/src/main/java/dvoraka/avservice/common/data/replication/DefaultReplicationMessage.java
@@ -29,6 +29,7 @@ public final class DefaultReplicationMessage implements ReplicationMessage, File
     private final String fromId;
     private final String toId;
     private final long sequence;
+    private final boolean master;
     private final MessageRouting routing;
     private final ReplicationStatus replicationStatus;
     private final Command command;
@@ -46,6 +47,7 @@ private DefaultReplicationMessage(Builder builder) {
         this.fromId = builder.fromId;
         this.toId = builder.toId;
         this.sequence = builder.sequence;
+        this.master = builder.master;
         this.routing = builder.routing;
         this.replicationStatus = builder.replicationStatus;
         this.command = builder.command;
@@ -96,6 +98,11 @@ public long getSequence() {
         return sequence;
     }
 
+    @Override
+    public boolean isMaster() {
+        return false;
+    }
+
     @Override
     public MessageRouting getRouting() {
         return routing;
@@ -177,6 +184,7 @@ public static class Builder {
         private String fromId;
         private String toId;
         private long sequence;
+        private boolean master;
         private MessageRouting routing;
         private ReplicationStatus replicationStatus;
         private Command command;
@@ -232,6 +240,11 @@ public Builder sequence(long sequence) {
             return this;
         }
 
+        public Builder master(boolean master) {
+            this.master = master;
+            return this;
+        }
+
         public Builder routing(MessageRouting routing) {
             this.routing = routing;
             return this;

diff --git a/common/src/main/java/dvoraka/avservice/common/data/replication/ReplicationMessage.java b/common/src/main/java/dvoraka/avservice/common/data/replication/ReplicationMessage.java
@@ -29,6 +29,13 @@ public interface ReplicationMessage extends FileMessage {
      */
     long getSequence();
 
+    /**
+     * Returns a master flag.
+     *
+     * @return the master flag
+     */
+    boolean isMaster();
+
     /**
      * Returns a message routing type.
      *

diff --git a/storage/src/main/java/dvoraka/avservice/storage/replication/DefaultRemoteLock.java b/storage/src/main/java/dvoraka/avservice/storage/replication/DefaultRemoteLock.java
@@ -61,6 +61,8 @@ public class DefaultRemoteLock implements
     private int maxResponseTime;
     private volatile boolean running;
 
+    private boolean master;
+
     private final String idString;
 
 
@@ -213,7 +215,12 @@ private void initializeSequence() {
                 .peek(message -> log.debug("Sequence {}: {}", idString, message))
                 .findFirst()
                 .map(ReplicationMessage::getSequence)
-                .orElse(1L);
+                .orElse((long) NOT_INITIALIZED);
+
+        if (actualSequence == NOT_INITIALIZED) {
+            setMaster(true);
+            actualSequence = 1;
+        }
 
         setSequence(actualSequence);
 
@@ -362,4 +369,12 @@ private void setRunning(boolean running) {
     public boolean isRunning() {
         return running;
     }
+
+    private boolean isMaster() {
+        return master;
+    }
+
+    private void setMaster(boolean master) {
+        this.master = master;
+    }
 }