Bug 3020: Add leader version to LeaderStateChanged

Added the leader's payload version to the LeaderStateChanged message and
modified the raft code to set it.

Change-Id: I9a34f90641a2962418d234bb56e55f2df5207e5b
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
(cherry picked from commit 13ba9adfa24716a7b27bc4cfef198b3fa5c577b0)

diff --git a/java/org/opendaylight/controller/cluster/notifications/LeaderStateChanged.java b/java/org/opendaylight/controller/cluster/notifications/LeaderStateChanged.java
index 23c95ecc99c0dea3ca144092018fd303d6dd7511..359e2b221b55105c685c7ce4362b89b9fc86e628 100644 (file)
--- a/java/org/opendaylight/controller/cluster/notifications/LeaderStateChanged.java
+++ b/java/org/opendaylight/controller/cluster/notifications/LeaderStateChanged.java
@@ -20,10 +20,12 @@ import javax.annotation.Nullable;
 public class LeaderStateChanged {
     private final String memberId;
     private final String leaderId;
+    private final short leaderPayloadVersion;
 
-    public LeaderStateChanged(@Nonnull String memberId, @Nullable String leaderId) {
+    public LeaderStateChanged(@Nonnull String memberId, @Nullable String leaderId, short leaderPayloadVersion) {
         this.memberId = Preconditions.checkNotNull(memberId);
         this.leaderId = leaderId;
+        this.leaderPayloadVersion = leaderPayloadVersion;
     }
 
     public @Nonnull String getMemberId() {
@@ -34,11 +36,15 @@ public class LeaderStateChanged {
         return leaderId;
     }
 
+    public short getLeaderPayloadVersion() {
+        return leaderPayloadVersion;
+    }
+
     @Override
     public String toString() {
         StringBuilder builder = new StringBuilder();
         builder.append("LeaderStateChanged [memberId=").append(memberId).append(", leaderId=").append(leaderId)
-                .append("]");
+                .append(", leaderPayloadVersion=").append(leaderPayloadVersion).append("]");
         return builder.toString();
     }
 }