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 cebf7b3cc66626b3bbe7742ca4e459b956398c33..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
@@ -8,21 +8,22 @@
 
 package org.opendaylight.controller.cluster.raft;
 
+import akka.actor.ActorContext;
 import akka.actor.ActorRef;
 import akka.actor.ActorSelection;
 import akka.actor.ActorSystem;
 import akka.actor.Props;
-import akka.actor.UntypedActorContext;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Supplier;
-import com.google.common.collect.Maps;
-
+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;
 
@@ -30,7 +31,7 @@ public class RaftActorContextImpl implements RaftActorContext {
 
     private final ActorRef actor;
 
-    private final UntypedActorContext context;
+    private final ActorContext context;
 
     private final String id;
 
@@ -42,12 +43,14 @@ public class RaftActorContextImpl implements RaftActorContext {
 
     private ReplicatedLog replicatedLog;
 
-    private final Map<String, String> peerAddresses;
+    private final Map<String, PeerInfo> peerInfoMap = new HashMap<>();
 
     private final Logger LOG;
 
     private ConfigParams configParams;
 
+    private boolean dynamicServerConfiguration = false;
+
     @VisibleForTesting
     private Supplier<Long> totalMemoryRetriever;
 
@@ -59,7 +62,7 @@ public class RaftActorContextImpl implements RaftActorContext {
 
     private short payloadVersion;
 
-    public RaftActorContextImpl(ActorRef actor, UntypedActorContext context, String id,
+    public RaftActorContextImpl(ActorRef actor, ActorContext context, String id,
             ElectionTerm termInformation, long commitIndex, long lastApplied, Map<String, String> peerAddresses,
             ConfigParams configParams, DataPersistenceProvider persistenceProvider, Logger logger) {
         this.actor = actor;
@@ -68,13 +71,16 @@ public class RaftActorContextImpl implements RaftActorContext {
         this.termInformation = termInformation;
         this.commitIndex = commitIndex;
         this.lastApplied = lastApplied;
-        this.peerAddresses = Maps.newHashMap(peerAddresses);
         this.configParams = configParams;
         this.persistenceProvider = persistenceProvider;
         this.LOG = logger;
+
+        for(Map.Entry<String, String> e: peerAddresses.entrySet()) {
+            peerInfoMap.put(e.getKey(), new PeerInfo(e.getKey(), e.getValue(), VotingState.VOTING));
+        }
     }
 
-    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;
     }
 
@@ -150,35 +156,70 @@ public class RaftActorContextImpl implements RaftActorContext {
     }
 
     @Override
-    public Map<String, String> getPeerAddresses() {
-        return new HashMap<String, String>(peerAddresses);
+    public Collection<String> getPeerIds() {
+        return peerInfoMap.keySet();
     }
 
     @Override
-    public Collection<String> getPeerIds() {
-        return peerAddresses.keySet();
+    public Collection<PeerInfo> getPeers() {
+        return peerInfoMap.values();
     }
 
-    @Override public String getPeerAddress(String peerId) {
-        String peerAddress = peerAddresses.get(peerId);
-        if(peerAddress == null) {
+    @Override
+    public PeerInfo getPeerInfo(String peerId) {
+        return peerInfoMap.get(peerId);
+    }
+
+    @Override
+    public String getPeerAddress(String peerId) {
+        String peerAddress = null;
+        PeerInfo peerInfo = peerInfoMap.get(peerId);
+        if(peerInfo != null) {
+            peerAddress = peerInfo.getAddress();
+            if(peerAddress == null) {
+                peerAddress = configParams.getPeerAddressResolver().resolve(peerId);
+                peerInfo.setAddress(peerAddress);
+            }
+        } else {
             peerAddress = configParams.getPeerAddressResolver().resolve(peerId);
-            peerAddresses.put(peerId, peerAddress);
         }
 
         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;
     }
 
-    @Override public void addToPeers(String name, String address) {
-        peerAddresses.put(name, address);
+    @Override
+    public void addToPeers(String id, String address, VotingState votingState) {
+        peerInfoMap.put(id, new PeerInfo(id, address, votingState));
     }
 
     @Override public void removePeer(String name) {
-        peerAddresses.remove(name);
+        peerInfoMap.remove(name);
     }
 
     @Override public ActorSelection getPeerActorSelection(String peerId) {
@@ -191,9 +232,10 @@ public class RaftActorContextImpl implements RaftActorContext {
 
     @Override
     public void setPeerAddress(String peerId, String peerAddress) {
-        if(peerAddresses.containsKey(peerId)) {
+        PeerInfo peerInfo = peerInfoMap.get(peerId);
+        if(peerInfo != null) {
             LOG.info("Peer address for peer {} set to {}", peerId, peerAddress);
-            peerAddresses.put(peerId, peerAddress);
+            peerInfo.setAddress(peerAddress);
         }
     }
 
@@ -230,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));
+    }
 }