Bug 2187: Bootstrap EOS shard when no local shards configured

[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 bbeaddb240c2ab9bb220178c04c9627c3826bd94..a96d5026639c693c7164616040c332c72b640b8d 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
@@ -13,13 +13,17 @@ import akka.actor.ActorRef;
 import akka.actor.ActorSelection;
 import akka.actor.ActorSystem;
 import akka.actor.Props;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Supplier;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import org.opendaylight.controller.cluster.DataPersistenceProvider;
+import org.opendaylight.controller.cluster.raft.ServerConfigurationPayload.ServerInfo;
 import org.opendaylight.controller.cluster.raft.policy.RaftPolicy;
 import org.slf4j.Logger;
 
@@ -45,6 +49,8 @@ public class RaftActorContextImpl implements RaftActorContext {
 
     private ConfigParams configParams;
 
+    private boolean dynamicServerConfiguration = false;
+
     @VisibleForTesting
     private Supplier<Long> totalMemoryRetriever;
 
@@ -74,7 +80,7 @@ public class RaftActorContextImpl implements RaftActorContext {
         }
     }
 
-    void setPayloadVersion(short payloadVersion) {
+    public void setPayloadVersion(short payloadVersion) {
         this.payloadVersion = payloadVersion;
     }
 
@@ -83,7 +89,7 @@ public class RaftActorContextImpl implements RaftActorContext {
         return payloadVersion;
     }
 
-    void setConfigParams(ConfigParams configParams) {
+    public void setConfigParams(ConfigParams configParams) {
         this.configParams = configParams;
     }
 
@@ -174,11 +180,35 @@ public class RaftActorContextImpl implements RaftActorContext {
                 peerAddress = configParams.getPeerAddressResolver().resolve(peerId);
                 peerInfo.setAddress(peerAddress);
             }
+        } else {
+            peerAddress = configParams.getPeerAddressResolver().resolve(peerId);
         }
 
         return peerAddress;
     }
 
+    @Override
+    public void updatePeerIds(ServerConfigurationPayload serverConfig){
+
+        Set<String> currentPeers = new HashSet<>(this.getPeerIds());
+        for(ServerInfo server: serverConfig.getServerConfig()) {
+            if(!getId().equals(server.getId())) {
+                VotingState votingState = server.isVoting() ? VotingState.VOTING: VotingState.NON_VOTING;
+                if(!currentPeers.contains(server.getId())) {
+                    this.addToPeers(server.getId(), null, votingState);
+                } else {
+                    this.getPeerInfo(server.getId()).setVotingState(votingState);
+                    currentPeers.remove(server.getId());
+                }
+            }
+        }
+
+        for(String peerIdToRemove: currentPeers) {
+            this.removePeer(peerIdToRemove);
+        }
+        setDynamicServerConfigurationInUse();
+    }
+
     @Override public ConfigParams getConfigParams() {
         return configParams;
     }
@@ -242,4 +272,29 @@ public class RaftActorContextImpl implements RaftActorContext {
     public RaftPolicy getRaftPolicy() {
         return configParams.getRaftPolicy();
     }
+
+    @Override
+    public boolean isDynamicServerConfigurationInUse() {
+        return dynamicServerConfiguration;
+    }
+
+    @Override
+    public void setDynamicServerConfigurationInUse() {
+        this.dynamicServerConfiguration = true;
+    }
+
+    @Override
+    public ServerConfigurationPayload getPeerServerInfo() {
+        if (!isDynamicServerConfigurationInUse()) {
+            return null;
+        }
+        Collection<PeerInfo> peers = getPeers();
+        List<ServerInfo> newConfig = new ArrayList<>(peers.size() + 1);
+        for(PeerInfo peer: peers) {
+            newConfig.add(new ServerInfo(peer.getId(), peer.isVoting()));
+        }
+
+        newConfig.add(new ServerInfo(getId(), true));
+        return (new ServerConfigurationPayload(newConfig));
+    }
 }