Bug 2187: Prevent non-voting member from initiating elections

[controller.git] / opendaylight / md-sal / sal-akka-raft / src / main / java / org / opendaylight / controller / cluster / raft / RaftActorContextImpl.java

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java
index a96d5026639c693c7164616040c332c72b640b8d..d9cfbcdd11a24db86a11fccf79fb023101a7becc 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorContextImpl.java
@@ -62,6 +62,8 @@ public class RaftActorContextImpl implements RaftActorContext {
 
     private short payloadVersion;
 
+    private boolean votingMember = true;
+
     public RaftActorContextImpl(ActorRef actor, ActorContext context, String id,
             ElectionTerm termInformation, long commitIndex, long lastApplied, Map<String, String> peerAddresses,
             ConfigParams configParams, DataPersistenceProvider persistenceProvider, Logger logger) {
@@ -189,10 +191,14 @@ public class RaftActorContextImpl implements RaftActorContext {
 
     @Override
     public void updatePeerIds(ServerConfigurationPayload serverConfig){
-
+        votingMember = true;
         Set<String> currentPeers = new HashSet<>(this.getPeerIds());
         for(ServerInfo server: serverConfig.getServerConfig()) {
-            if(!getId().equals(server.getId())) {
+            if(getId().equals(server.getId())) {
+                if(!server.isVoting()) {
+                    votingMember = false;
+                }
+            } else {
                 VotingState votingState = server.isVoting() ? VotingState.VOTING: VotingState.NON_VOTING;
                 if(!currentPeers.contains(server.getId())) {
                     this.addToPeers(server.getId(), null, votingState);
@@ -297,4 +303,9 @@ public class RaftActorContextImpl implements RaftActorContext {
         newConfig.add(new ServerInfo(getId(), true));
         return (new ServerConfigurationPayload(newConfig));
     }
+
+    @Override
+    public boolean isVotingMember() {
+        return votingMember;
+    }
 }