X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2Fmessages%2FInstallSnapshot.java;h=d2a6a0d0824b53895e860491c7958aa50132c65d;hp=6337f8f6dce4f9cae5f223c4178f5095fb902c82;hb=9d5ec5cdd146a56bc03e35b6718e9492a5c8410a;hpb=96c54fa85d331d74bc4a44dab383d334a4f3afaf

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java
index 6337f8f6dc..d2a6a0d082 100644
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java
@@ -10,23 +10,35 @@ package org.opendaylight.controller.cluster.raft.messages;
 
 import com.google.common.base.Optional;
 import com.google.protobuf.ByteString;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.opendaylight.controller.cluster.raft.RaftVersions;
+import org.opendaylight.controller.cluster.raft.persisted.ServerConfigurationPayload;
 import org.opendaylight.controller.protobuff.messages.cluster.raft.InstallSnapshotMessages;
 
-public class InstallSnapshot extends AbstractRaftRPC {
-
-    public static final Class<InstallSnapshotMessages.InstallSnapshot> SERIALIZABLE_CLASS = InstallSnapshotMessages.InstallSnapshot.class;
+public class InstallSnapshot extends AbstractRaftRPC implements Externalizable {
     private static final long serialVersionUID = 1L;
+    public static final Class<InstallSnapshotMessages.InstallSnapshot> SERIALIZABLE_CLASS = InstallSnapshotMessages.InstallSnapshot.class;
 
-    private final String leaderId;
-    private final long lastIncludedIndex;
-    private final long lastIncludedTerm;
-    private final ByteString data;
-    private final int chunkIndex;
-    private final int totalChunks;
-    private final Optional<Integer> lastChunkHashCode;
+    private String leaderId;
+    private long lastIncludedIndex;
+    private long lastIncludedTerm;
+    private byte[] data;
+    private int chunkIndex;
+    private int totalChunks;
+    private Optional<Integer> lastChunkHashCode;
+    private Optional<ServerConfigurationPayload> serverConfig;
+
+    /**
+     * Empty constructor to satisfy Externalizable.
+     */
+    public InstallSnapshot() {
+    }
 
-    public InstallSnapshot(long term, String leaderId, long lastIncludedIndex,
-        long lastIncludedTerm, ByteString data, int chunkIndex, int totalChunks, Optional<Integer> lastChunkHashCode) {
+    public InstallSnapshot(long term, String leaderId, long lastIncludedIndex, long lastIncludedTerm, byte[] data,
+            int chunkIndex, int totalChunks, Optional<Integer> lastChunkHashCode, Optional<ServerConfigurationPayload> serverConfig) {
         super(term);
         this.leaderId = leaderId;
         this.lastIncludedIndex = lastIncludedIndex;
@@ -35,14 +47,15 @@ public class InstallSnapshot extends AbstractRaftRPC {
         this.chunkIndex = chunkIndex;
         this.totalChunks = totalChunks;
         this.lastChunkHashCode = lastChunkHashCode;
+        this.serverConfig = serverConfig;
     }
 
     public InstallSnapshot(long term, String leaderId, long lastIncludedIndex,
-                           long lastIncludedTerm, ByteString data, int chunkIndex, int totalChunks) {
-        this(term, leaderId, lastIncludedIndex, lastIncludedTerm, data, chunkIndex, totalChunks, Optional.<Integer>absent());
+                           long lastIncludedTerm, byte[] data, int chunkIndex, int totalChunks) {
+        this(term, leaderId, lastIncludedIndex, lastIncludedTerm, data, chunkIndex, totalChunks,
+                Optional.<Integer>absent(), Optional.<ServerConfigurationPayload>absent());
     }
 
-
     public String getLeaderId() {
         return leaderId;
     }
@@ -55,7 +68,7 @@ public class InstallSnapshot extends AbstractRaftRPC {
         return lastIncludedTerm;
     }
 
-    public ByteString getData() {
+    public byte[] getData() {
         return data;
     }
 
@@ -71,35 +84,109 @@ public class InstallSnapshot extends AbstractRaftRPC {
         return lastChunkHashCode;
     }
 
-    public <T extends Object> Object toSerializable(){
-        InstallSnapshotMessages.InstallSnapshot.Builder builder = InstallSnapshotMessages.InstallSnapshot.newBuilder()
-                .setLeaderId(this.getLeaderId())
-                .setChunkIndex(this.getChunkIndex())
-                .setData(this.getData())
-                .setLastIncludedIndex(this.getLastIncludedIndex())
-                .setLastIncludedTerm(this.getLastIncludedTerm())
-                .setTotalChunks(this.getTotalChunks());
+    public Optional<ServerConfigurationPayload> getServerConfig() {
+        return serverConfig;
+    }
+
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+        out.writeShort(RaftVersions.CURRENT_VERSION);
+        out.writeLong(getTerm());
+        out.writeUTF(leaderId);
+        out.writeLong(lastIncludedIndex);
+        out.writeLong(lastIncludedTerm);
+        out.writeInt(chunkIndex);
+        out.writeInt(totalChunks);
+
+        out.writeByte(lastChunkHashCode.isPresent() ? 1 : 0);
+        if(lastChunkHashCode.isPresent()) {
+            out.writeInt(lastChunkHashCode.get().intValue());
+        }
 
-        if(lastChunkHashCode.isPresent()){
-            builder.setLastChunkHashCode(lastChunkHashCode.get());
+        out.writeByte(serverConfig.isPresent() ? 1 : 0);
+        if(serverConfig.isPresent()) {
+            out.writeObject(serverConfig.get());
         }
-        return builder.build();
+
+        out.writeObject(data);
     }
 
-    public static InstallSnapshot fromSerializable (Object o) {
-        InstallSnapshotMessages.InstallSnapshot from =
-            (InstallSnapshotMessages.InstallSnapshot) o;
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+        in.readShort(); // raft version - not currently used
+        setTerm(in.readLong());
+        leaderId = in.readUTF();
+        lastIncludedIndex = in.readLong();
+        lastIncludedTerm = in.readLong();
+        chunkIndex = in.readInt();
+        totalChunks = in.readInt();
+
+        lastChunkHashCode = Optional.absent();
+        boolean chunkHashCodePresent = in.readByte() == 1;
+        if(chunkHashCodePresent) {
+            lastChunkHashCode = Optional.of(in.readInt());
+        }
+
+        serverConfig = Optional.absent();
+        boolean serverConfigPresent = in.readByte() == 1;
+        if(serverConfigPresent) {
+            serverConfig = Optional.of((ServerConfigurationPayload)in.readObject());
+        }
 
-        Optional<Integer> lastChunkHashCode = Optional.absent();
-        if(from.hasLastChunkHashCode()){
-            lastChunkHashCode = Optional.of(from.getLastChunkHashCode());
+        data = (byte[])in.readObject();
+    }
+
+    public <T extends Object> Object toSerializable(short version) {
+        if(version >= RaftVersions.BORON_VERSION) {
+            return this;
+        } else {
+            InstallSnapshotMessages.InstallSnapshot.Builder builder = InstallSnapshotMessages.InstallSnapshot.newBuilder()
+                    .setTerm(this.getTerm())
+                    .setLeaderId(this.getLeaderId())
+                    .setChunkIndex(this.getChunkIndex())
+                    .setData(ByteString.copyFrom(getData()))
+                    .setLastIncludedIndex(this.getLastIncludedIndex())
+                    .setLastIncludedTerm(this.getLastIncludedTerm())
+                    .setTotalChunks(this.getTotalChunks());
+
+            if(lastChunkHashCode.isPresent()){
+                builder.setLastChunkHashCode(lastChunkHashCode.get());
+            }
+            return builder.build();
         }
+    }
 
-        InstallSnapshot installSnapshot = new InstallSnapshot(from.getTerm(),
-            from.getLeaderId(), from.getLastIncludedIndex(),
-            from.getLastIncludedTerm(), from.getData(),
-            from.getChunkIndex(), from.getTotalChunks(), lastChunkHashCode);
+    @Override
+    public String toString() {
+        return "InstallSnapshot [term=" + getTerm() + ", leaderId=" + leaderId + ", lastIncludedIndex="
+                + lastIncludedIndex + ", lastIncludedTerm=" + lastIncludedTerm + ", datasize=" + data.length
+                + ", Chunk=" + chunkIndex + "/" + totalChunks + ", lastChunkHashCode=" + lastChunkHashCode
+                + ", serverConfig=" + serverConfig.orNull() + "]";
+    }
+
+    public static InstallSnapshot fromSerializable (Object o) {
+        if(o instanceof InstallSnapshot) {
+            return (InstallSnapshot)o;
+        } else {
+            InstallSnapshotMessages.InstallSnapshot from =
+                    (InstallSnapshotMessages.InstallSnapshot) o;
+
+            Optional<Integer> lastChunkHashCode = Optional.absent();
+            if(from.hasLastChunkHashCode()){
+                lastChunkHashCode = Optional.of(from.getLastChunkHashCode());
+            }
+
+            InstallSnapshot installSnapshot = new InstallSnapshot(from.getTerm(),
+                    from.getLeaderId(), from.getLastIncludedIndex(),
+                    from.getLastIncludedTerm(), from.getData().toByteArray(),
+                    from.getChunkIndex(), from.getTotalChunks(), lastChunkHashCode,
+                    Optional.<ServerConfigurationPayload>absent());
+
+            return installSnapshot;
+        }
+    }
 
-        return installSnapshot;
+    public static boolean isSerializedType(Object message) {
+        return message instanceof InstallSnapshot || message instanceof InstallSnapshotMessages.InstallSnapshot;
     }
 }