More DC/OS fixes (#55)

* depend on marathon api * bind host/port fix for DC/OS * Increase service locator timeout and implement retries
lightbend · Mar 26, 2018 · 2d6eb55 · 2d6eb55
1 parent 5c4acdb
commit 2d6eb55
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/akka-management/src/main/resources/rp-tooling.conf b/akka-management/src/main/resources/rp-tooling.conf
@@ -3,8 +3,10 @@ akka {
 
   management {
     http {
-      hostname = ${?RP_ENDPOINT_AKKA_MGMT_HTTP_BIND_HOST}
-      port = ${?RP_ENDPOINT_AKKA_MGMT_HTTP_BIND_PORT}
+      hostname = ${?RP_ENDPOINT_AKKA_MGMT_HTTP_HOST}
+      port = ${?RP_ENDPOINT_AKKA_MGMT_HTTP_PORT}
+      bind-hostname = ${?RP_ENDPOINT_AKKA_MGMT_HTTP_BIND_HOST}
+      bind-port = ${?RP_ENDPOINT_AKKA_MGMT_HTTP_BIND_PORT}
     }
   }
 }
diff --git a/build.sbt b/build.sbt
@@ -130,6 +130,7 @@ lazy val akkaClusterBootstrap = createProject("reactive-lib-akka-cluster-bootstr
   .settings(
     libraryDependencies ++= Seq(
       "com.lightbend.akka.discovery"  %% "akka-discovery-kubernetes-api"     % Versions.akkaManagement,
+      "com.lightbend.akka.discovery"  %% "akka-discovery-marathon-api"       % Versions.akkaManagement,
       "com.lightbend.akka.management" %% "akka-management-cluster-bootstrap" % Versions.akkaManagement,
       "com.typesafe.akka"             %% "akka-testkit"                      % Versions.akka              % "test",
       "com.typesafe.akka"             %% "akka-cluster"                      % Versions.akka              % "provided"

diff --git a/service-discovery/src/main/resources/reference.conf b/service-discovery/src/main/resources/reference.conf
@@ -1,6 +1,6 @@
 com.lightbend.platform-tooling {
   service-discovery {
-    ask-timeout = 1 second
+    ask-timeout = 5 seconds
 
     external-service-addresses {
     #  "my-service/my-endpoint" {
@@ -9,5 +9,7 @@ com.lightbend.platform-tooling {
     }
 
     external-service-address-limit = 3
+
+    retry-delays = [100 milliseconds, 500 milliseconds, 1 second]
   }
 }
diff --git a/...-discovery/src/main/scala/com/lightbend/rp/servicediscovery/scaladsl/ServiceLocator.scala b/...-discovery/src/main/scala/com/lightbend/rp/servicediscovery/scaladsl/ServiceLocator.scala
@@ -19,15 +19,16 @@ package com.lightbend.rp.servicediscovery.scaladsl
 import akka.actor._
 import akka.io.Dns.Resolved
 import akka.io.{ Dns, IO }
-import akka.pattern.ask
+import akka.pattern.{ after, ask }
 import com.lightbend.rp.asyncdns.AsyncDnsResolver
 import com.lightbend.rp.asyncdns.raw.SRVRecord
 import com.lightbend.rp.common._
 import com.lightbend.rp.servicediscovery.scaladsl.ServiceLocatorLike.{ AddressSelection, AddressSelectionRandom }
 import java.net.URI
 import java.util.concurrent.ThreadLocalRandom
 import scala.collection.immutable.Seq
-import scala.concurrent.Future
+import scala.concurrent.{ ExecutionContext, Future }
+import scala.concurrent.duration.FiniteDuration
 
 import AsyncDnsResolver.SrvResolved
 
@@ -226,6 +227,12 @@ trait ServiceLocatorLike {
       else
         s"$name/$endpoint"
 
+    def retry[T](delays: Seq[FiniteDuration])(value: => Future[T]): Future[T] =
+      value
+        .recoverWith {
+          case _ if delays.nonEmpty => after(delays.head, as.scheduler)(retry(delays.tail)(value))
+        }
+
     settings.externalServiceAddresses.get(externalEntry) match {
       case Some(services) =>
         val resolved =
@@ -264,8 +271,7 @@ trait ServiceLocatorLike {
                       for {
                         srvRecord <- srvRecords
                       } yield {
-                        dnsResolver
-                          .ask(Dns.Resolve(srvRecord.target))(settings.askTimeout)
+                        retry(settings.retryDelays)(dnsResolver.ask(Dns.Resolve(srvRecord.target))(settings.askTimeout))
                           .collect {
                             case aRecord: Resolved =>
                               translateResolvedSrv(protocol, srvRecord, aRecord)

diff --git a/service-discovery/src/main/scala/com/lightbend/rp/servicediscovery/scaladsl/Settings.scala b/service-discovery/src/main/scala/com/lightbend/rp/servicediscovery/scaladsl/Settings.scala
@@ -41,6 +41,13 @@ final class Settings(system: ExtendedActorSystem) extends Extension {
 
   val externalServiceAddressLimit: Int = serviceDiscovery.getInt("external-service-address-limit")
 
+  val retryDelays: Seq[FiniteDuration] =
+    serviceDiscovery
+      .getDurationList("retry-delays", MILLISECONDS)
+      .asScala
+      .toVector
+      .map(Duration(_, MILLISECONDS))
+
   private def duration(config: Config, key: String): FiniteDuration =
     Duration(config.getDuration(key, MILLISECONDS), MILLISECONDS)
 }