X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FClusterWrapperImpl.java;h=56229132f34c3dec9a61ea1ea4377831f2af3274;hp=142aacde65c32f1050846810c8d33b1c9122be55;hb=8e6e0aeb5ca474cb292aab6ca581e921b0a56489;hpb=1e59825dbec7b354d76bd7efa6a61e4ad802c802

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ClusterWrapperImpl.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ClusterWrapperImpl.java
index 142aacde65..56229132f3 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ClusterWrapperImpl.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ClusterWrapperImpl.java
@@ -10,26 +10,50 @@ package org.opendaylight.controller.cluster.datastore;
 
 import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
+import akka.actor.Address;
 import akka.cluster.Cluster;
 import akka.cluster.ClusterEvent;
+import com.google.common.base.Preconditions;
+import org.opendaylight.controller.cluster.access.concepts.MemberName;
 
 public class ClusterWrapperImpl implements ClusterWrapper {
     private final Cluster cluster;
-    private final String currentMemberName;
+    private final MemberName currentMemberName;
+    private final Address selfAddress;
 
     public ClusterWrapperImpl(ActorSystem actorSystem){
+        Preconditions.checkNotNull(actorSystem, "actorSystem should not be null");
+
         cluster = Cluster.get(actorSystem);
-        currentMemberName = (String) cluster.getSelfRoles().toArray()[0];
 
+        Preconditions.checkState(cluster.getSelfRoles().size() > 0,
+            "No akka roles were specified\n" +
+                "One way to specify the member name is to pass a property on the command line like so\n" +
+                "   -Dakka.cluster.roles.0=member-3\n" +
+                "member-3 here would be the name of the member"
+        );
+
+        currentMemberName = MemberName.forName(cluster.getSelfRoles().iterator().next());
+        selfAddress = cluster.selfAddress();
     }
 
+    @Override
     public void subscribeToMemberEvents(ActorRef actorRef){
+        Preconditions.checkNotNull(actorRef, "actorRef should not be null");
+
         cluster.subscribe(actorRef, ClusterEvent.initialStateAsEvents(),
             ClusterEvent.MemberEvent.class,
-            ClusterEvent.UnreachableMember.class);
+            ClusterEvent.UnreachableMember.class,
+            ClusterEvent.ReachableMember.class);
     }
 
-    public String getCurrentMemberName() {
+    @Override
+    public MemberName getCurrentMemberName() {
         return currentMemberName;
     }
+
+    @Override
+    public Address getSelfAddress() {
+        return selfAddress;
+    }
 }