import akka.cluster.ClusterEvent;
import akka.japi.Creator;
import akka.japi.Function;
+
import com.google.common.base.Preconditions;
+
+import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier;
+import org.opendaylight.controller.cluster.datastore.identifiers.ShardManagerIdentifier;
+import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shardmanager.ShardManagerInfo;
+import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shardmanager.ShardManagerInfoMBean;
import org.opendaylight.controller.cluster.datastore.messages.FindLocalShard;
import org.opendaylight.controller.cluster.datastore.messages.FindPrimary;
import org.opendaylight.controller.cluster.datastore.messages.LocalShardFound;
import org.opendaylight.controller.cluster.datastore.messages.PrimaryFound;
import org.opendaylight.controller.cluster.datastore.messages.PrimaryNotFound;
import org.opendaylight.controller.cluster.datastore.messages.UpdateSchemaContext;
+
+import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
import scala.concurrent.duration.Duration;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
private final Configuration configuration;
+ private ShardManagerInfoMBean mBean;
+
+ private final ShardContext shardContext;
+
/**
* @param type defines the kind of data that goes into shards created by this shard manager. Examples of type would be
* configuration or operational
*/
- private ShardManager(String type, ClusterWrapper cluster, Configuration configuration) {
+ private ShardManager(String type, ClusterWrapper cluster, Configuration configuration,
+ ShardContext shardContext) {
this.type = Preconditions.checkNotNull(type, "type should not be null");
this.cluster = Preconditions.checkNotNull(cluster, "cluster should not be null");
this.configuration = Preconditions.checkNotNull(configuration, "configuration should not be null");
+ this.shardContext = shardContext;
// Subscribe this actor to cluster member events
cluster.subscribeToMemberEvents(getSelf());
public static Props props(final String type,
final ClusterWrapper cluster,
- final Configuration configuration) {
- return Props.create(new Creator<ShardManager>() {
+ final Configuration configuration,
+ final ShardContext shardContext) {
- @Override
- public ShardManager create() throws Exception {
- return new ShardManager(type, cluster, configuration);
- }
- });
- }
+ Preconditions.checkNotNull(type, "type should not be null");
+ Preconditions.checkNotNull(cluster, "cluster should not be null");
+ Preconditions.checkNotNull(configuration, "configuration should not be null");
+ return Props.create(new ShardManagerCreator(type, cluster, configuration, shardContext));
+ }
@Override
public void handleReceive(Object message) throws Exception {
} else if(message instanceof ClusterEvent.UnreachableMember) {
ignoreMessage(message);
} else{
- throw new Exception ("Not recognized message received, message="+message);
+ unknownMessage(message);
}
}
return;
}
- getSender().tell(new LocalShardNotFound(message.getShardName()), getSelf());
- }
-
- private void ignoreMessage(Object message){
- LOG.debug("Unhandled message : " + message);
+ getSender().tell(new LocalShardNotFound(message.getShardName()),
+ getSelf());
}
private void memberRemoved(ClusterEvent.MemberRemoved message) {
for(ShardInformation info : localShards.values()){
String shardName = info.getShardName();
- info.updatePeerAddress(getShardActorName(memberName, shardName),
+ info.updatePeerAddress(getShardIdentifier(memberName, shardName),
getShardActorPath(shardName, memberName));
}
}
private void findPrimary(FindPrimary message) {
String shardName = message.getShardName();
- List<String> members =
- configuration.getMembersFromShardName(shardName);
-
// First see if the there is a local replica for the shard
ShardInformation info = localShards.get(shardName);
if(info != null) {
}
}
+ List<String> members =
+ configuration.getMembersFromShardName(shardName);
+
if(cluster.getCurrentMemberName() != null) {
members.remove(cluster.getCurrentMemberName());
}
private String getShardActorPath(String shardName, String memberName) {
Address address = memberNameToAddress.get(memberName);
if(address != null) {
- return address.toString() + "/user/shardmanager-" + this.type + "/"
- + getShardActorName(
- memberName, shardName);
+ StringBuilder builder = new StringBuilder();
+ builder.append(address.toString())
+ .append("/user/")
+ .append(ShardManagerIdentifier.builder().type(type).build().toString())
+ .append("/")
+ .append(getShardIdentifier(memberName, shardName));
+ return builder.toString();
}
return null;
}
* @param shardName
* @return
*/
- private String getShardActorName(String memberName, String shardName){
- return memberName + "-shard-" + shardName + "-" + this.type;
+ private ShardIdentifier getShardIdentifier(String memberName, String shardName){
+ return ShardIdentifier.builder().memberName(memberName).shardName(shardName).type(type).build();
}
/**
List<String> memberShardNames =
this.configuration.getMemberShardNames(memberName);
+ List<String> localShardActorNames = new ArrayList<>();
for(String shardName : memberShardNames){
- String shardActorName = getShardActorName(memberName, shardName);
- Map<String, String> peerAddresses = getPeerAddresses(shardName);
+ ShardIdentifier shardId = getShardIdentifier(memberName, shardName);
+ Map<ShardIdentifier, String> peerAddresses = getPeerAddresses(shardName);
ActorRef actor = getContext()
- .actorOf(Shard.props(shardActorName, peerAddresses),
- shardActorName);
+ .actorOf(Shard.props(shardId, peerAddresses, shardContext).
+ withMailbox(ActorContext.MAILBOX), shardId.toString());
+
+ localShardActorNames.add(shardId.toString());
localShards.put(shardName, new ShardInformation(shardName, actor, peerAddresses));
}
+ mBean = ShardManagerInfo
+ .createShardManagerMBean("shard-manager-" + this.type, localShardActorNames);
+
}
/**
* @param shardName
* @return
*/
- private Map<String, String> getPeerAddresses(String shardName){
+ private Map<ShardIdentifier, String> getPeerAddresses(String shardName){
- Map<String, String> peerAddresses = new HashMap<>();
+ Map<ShardIdentifier, String> peerAddresses = new HashMap<>();
List<String> members =
this.configuration.getMembersFromShardName(shardName);
for(String memberName : members){
if(!currentMemberName.equals(memberName)){
- String shardActorName = getShardActorName(memberName, shardName);
+ ShardIdentifier shardId = getShardIdentifier(memberName,
+ shardName);
String path =
getShardActorPath(shardName, currentMemberName);
- peerAddresses.put(shardActorName, path);
+ peerAddresses.put(shardId, path);
}
}
return peerAddresses;
}
-
@Override
public SupervisorStrategy supervisorStrategy() {
+
return new OneForOneStrategy(10, Duration.create("1 minute"),
new Function<Throwable, SupervisorStrategy.Directive>() {
@Override
public SupervisorStrategy.Directive apply(Throwable t) {
+ StringBuilder sb = new StringBuilder();
+ for(StackTraceElement element : t.getStackTrace()) {
+ sb.append("\n\tat ")
+ .append(element.toString());
+ }
+ LOG.warning("Supervisor Strategy of resume applied {}",sb.toString());
return SupervisorStrategy.resume();
}
}
private final String shardName;
private final ActorRef actor;
private final ActorPath actorPath;
- private final Map<String, String> peerAddresses;
+ private final Map<ShardIdentifier, String> peerAddresses;
private ShardInformation(String shardName, ActorRef actor,
- Map<String, String> peerAddresses) {
+ Map<ShardIdentifier, String> peerAddresses) {
this.shardName = shardName;
this.actor = actor;
this.actorPath = actor.path();
return actorPath;
}
- public Map<String, String> getPeerAddresses() {
- return peerAddresses;
- }
-
- public void updatePeerAddress(String peerId, String peerAddress){
- LOG.info("updatePeerAddress for peer {} with address {}", peerId, peerAddress);
+ public void updatePeerAddress(ShardIdentifier peerId, String peerAddress){
+ LOG.info("updatePeerAddress for peer {} with address {}", peerId,
+ peerAddress);
if(peerAddresses.containsKey(peerId)){
peerAddresses.put(peerId, peerAddress);
- LOG.info("Sending PeerAddressResolved for peer {} with address {} to {}", peerId, peerAddress, actor.path());
+ LOG.debug(
+ "Sending PeerAddressResolved for peer {} with address {} to {}",
+ peerId, peerAddress, actor.path());
actor
.tell(new PeerAddressResolved(peerId, peerAddress),
}
}
}
+
+ private static class ShardManagerCreator implements Creator<ShardManager> {
+ private static final long serialVersionUID = 1L;
+
+ final String type;
+ final ClusterWrapper cluster;
+ final Configuration configuration;
+ final ShardContext shardContext;
+
+ ShardManagerCreator(String type, ClusterWrapper cluster,
+ Configuration configuration, ShardContext shardContext) {
+ this.type = type;
+ this.cluster = cluster;
+ this.configuration = configuration;
+ this.shardContext = shardContext;
+ }
+
+ @Override
+ public ShardManager create() throws Exception {
+ return new ShardManager(type, cluster, configuration, shardContext);
+ }
+ }
}
+
+
+
Code Review / controller.git / blobdiff