Merge pull request #114 from delphi-hub/bugfix/invalidLinkStates

Fixed a bug concerning link state updates

Author: 24santoshr

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/RequestHandler.scala

@@ -295,7 +295,7 @@ class RequestHandler(configuration: Configuration, authDao: AuthDAO, instanceDao
 
         deployResult match {
           case Failure(ex) =>
-            log.warning(s"Failed to deploy container, docker host not reachable.")
+            log.warning(s"Failed to deploy container, docker host not reachable. Message ${ex.getMessage}")
             instanceDao.removeInstance(id)
             fireDockerOperationErrorEvent(None, s"Deploy failed with message: ${ex.getMessage}")
             Failure(new RuntimeException(s"Failed to deploy container, docker host not reachable (${ex.getMessage})."))

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/daos/DatabaseInstanceDAO.scala

@@ -286,17 +286,18 @@ class DatabaseInstanceDAO (configuration : Configuration) extends InstanceDAO wi
   override def addLink(link: InstanceLink) : Try[Unit] = {
     if(hasInstance(link.idFrom) && hasInstance(link.idTo)){
 
+      //If new link is in state 'Assigned': Set any link that previously was assigned to 'outdated'
+      //IMPORTANT: Only works bc every component has exactly one dependency!
+      if(link.linkState == LinkState.Assigned){
+        for (prevLink <- getLinksFrom(link.idFrom, Some(LinkState.Assigned))){
+          updateLink(InstanceLink(prevLink.idFrom, prevLink.idTo, LinkState.Outdated))
+        }
+      }
+
       if(getLinksFrom(link.idFrom).exists(l => l.idTo == link.idTo)){
         //There already is a link between the two instances. Update it instead of adding a new one
         updateLink(link)
       } else {
-        //If new link is in state 'Assigned': Set any link that previously was assigned to 'outdated'
-        //IMPORTANT: Only works bc every component has exactly one dependency!
-        if(link.linkState == LinkState.Assigned){
-          for (prevLink <- getLinksFrom(link.idFrom, Some(LinkState.Assigned))){
-            updateLink(InstanceLink(prevLink.idFrom, prevLink.idTo, LinkState.Outdated))
-          }
-        }
         addLinkFromInstanceLink(link)
       }
       Success()

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/daos/DynamicInstanceDAO.scala

@@ -242,17 +242,18 @@ class DynamicInstanceDAO (configuration : Configuration) extends InstanceDAO wit
   override def addLink(link: InstanceLink) : Try[Unit] = {
     if(hasInstance(link.idFrom) && hasInstance(link.idTo)){
 
+      //If new link is in state 'Assigned': Set any link that previously was assigned to 'outdated'
+      //IMPORTANT: Only works bc every component has exactly one dependency!
+      if(link.linkState == LinkState.Assigned){
+        for (prevLink <- getLinksFrom(link.idFrom, Some(LinkState.Assigned))){
+          updateLink(InstanceLink(prevLink.idFrom, prevLink.idTo, LinkState.Outdated))
+        }
+      }
+
       if(getLinksFrom(link.idFrom).exists(l => l.idTo == link.idTo)){
         //There already is a link between the two instances. Update it instead of adding a new one
         updateLink(link)
       } else {
-        //If new link is in state 'Assigned': Set any link that previously was assigned to 'outdated'
-        //IMPORTANT: Only works bc every component has exactly one dependency!
-        if(link.linkState == LinkState.Assigned){
-          for (prevLink <- getLinksFrom(link.idFrom, Some(LinkState.Assigned))){
-            updateLink(InstanceLink(prevLink.idFrom, prevLink.idTo, LinkState.Outdated))
-          }
-        }
         instanceLinks.add(link)
       }
       Success()
@@ -267,8 +268,8 @@ class DynamicInstanceDAO (configuration : Configuration) extends InstanceDAO wit
     if(linksMatching.nonEmpty){
       for(l <- linksMatching){
         instanceLinks.remove(l)
-        instanceLinks.add(link)
       }
+      instanceLinks.add(link)
       Success()
     } else {
       Failure(new RuntimeException(s"Cannot update link $link, this link is not present in the dao."))