filter selfnode from nodeslist (#162)

hseeberger · May 2, 2017 · 857c9e4 · 857c9e4
1 parent 6bf4b89
commit 857c9e4
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/core/src/main/scala/de/heikoseeberger/constructr/ConstructrMachine.scala b/core/src/main/scala/de/heikoseeberger/constructr/ConstructrMachine.scala
@@ -112,13 +112,19 @@ final class ConstructrMachine(
   onTransition {
     case _ -> State.GettingNodes =>
       log.debug("Transitioning to GettingNodes")
-      coordination.getNodes().pipeTo(self)
+      coordination.getNodes().map { nodes =>
+        if(nodes.contains(selfNode))
+          log.warning(s"Selfnode received in list of nodes $nodes. Will filter to prevent forming an island.")
+
+        nodes.filterNot(_ == selfNode)
+      } pipeTo self
   }
 
   when(State.GettingNodes, coordinationTimeout) {
     case Event(nodes: Set[Address] @unchecked, _) if nodes.isEmpty =>
       log.debug("Received empty nodes, going to Locking")
-      goto(State.Locking).using(stateData.copy(nrOfRetriesLeft = nrOfRetries))
+      goto(State.Locking)
+        .using(stateData.copy(nrOfRetriesLeft = nrOfRetries))
 
     case Event(nodes: Set[Address] @unchecked, _) =>
       log.debug(s"Received nodes $nodes, going to Joining")