From 2468511ab96e9b35441692b02d60758e9c67bb04 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 4 Feb 2019 13:20:29 -0500 Subject: [PATCH] -Dplay.server.pidfile.path=/dev/null Ref https://github.com/lightbend/sbt-reactive-app/pull/174 Add `-Dplay.server.pidfile.path=/dev/null` --- .../runtime/kubernetes/PodTemplate.scala | 3 ++- .../marathon/RpEnvironmentVariables.scala | 3 ++- .../kubernetes/DeploymentJsonTest.scala | 21 ++++++++++++++----- .../marathon/RpEnvironmentVariablesTest.scala | 13 ++++++++++-- 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/runtime/kubernetes/PodTemplate.scala b/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/runtime/kubernetes/PodTemplate.scala index 8013ae3b..b9413baf 100644 --- a/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/runtime/kubernetes/PodTemplate.scala +++ b/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/runtime/kubernetes/PodTemplate.scala @@ -116,7 +116,8 @@ object PodTemplate { }) ++ List( s"-Dakka.management.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=$noOfReplicas", - s"${if (akkaClusterJoinExisting) "-Dakka.management.cluster.bootstrap.form-new-cluster=false" else ""}")) + s"${if (akkaClusterJoinExisting) "-Dakka.management.cluster.bootstrap.form-new-cluster=false" else ""}", + s"-Dplay.server.pidfile.path=/dev/null")) .filter(_.nonEmpty) .mkString(" ")), "RP_DYN_JAVA_OPTS" -> LiteralEnvironmentVariable( diff --git a/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/runtime/marathon/RpEnvironmentVariables.scala b/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/runtime/marathon/RpEnvironmentVariables.scala index ecd0bd9c..d0c169aa 100644 --- a/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/runtime/marathon/RpEnvironmentVariables.scala +++ b/cli/shared/src/main/scala/com/lightbend/rp/reactivecli/runtime/marathon/RpEnvironmentVariables.scala @@ -69,7 +69,8 @@ object RpEnvironmentVariables { s"-Dakka.management.cluster.bootstrap.contact-point-discovery.effective-name=$serviceResourceName", s"-Dakka.management.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=$noOfReplicas", akkaClusterBootstrapSystemName.fold("-Dakka.discovery.marathon-api.app-label-query=APP_NAME==%s")(systemName => s"-Dakka.discovery.marathon-api.app-label-query=ACTOR_SYSTEM_NAME==$systemName"), - s"${if (akkaClusterJoinExisting) "-Dakka.management.cluster.bootstrap.form-new-cluster=false" else ""}") + s"${if (akkaClusterJoinExisting) "-Dakka.management.cluster.bootstrap.form-new-cluster=false" else ""}", + s"-Dplay.server.pidfile.path=/dev/null") .filter(_.nonEmpty) .mkString(" ")) diff --git a/cli/shared/src/test/scala/com/lightbend/rp/reactivecli/runtime/kubernetes/DeploymentJsonTest.scala b/cli/shared/src/test/scala/com/lightbend/rp/reactivecli/runtime/kubernetes/DeploymentJsonTest.scala index 3e60b3a4..948bfcdc 100644 --- a/cli/shared/src/test/scala/com/lightbend/rp/reactivecli/runtime/kubernetes/DeploymentJsonTest.scala +++ b/cli/shared/src/test/scala/com/lightbend/rp/reactivecli/runtime/kubernetes/DeploymentJsonTest.scala @@ -278,7 +278,8 @@ object DeploymentJsonTest extends TestSuite { assert(javaOpts.contains("-Dakka.management.cluster.bootstrap.contact-point-discovery.discovery-method=kubernetes-api") && javaOpts.contains("-Dakka.management.cluster.bootstrap.contact-point-discovery.port-name=management") && javaOpts.contains("-Dakka.management.cluster.bootstrap.contact-point-discovery.effective-name=friendimpl") && - javaOpts.contains("-Dakka.discovery.kubernetes-api.pod-label-selector=akka.lightbend.com/service-name=%s")) + javaOpts.contains("-Dakka.discovery.kubernetes-api.pod-label-selector=akka.lightbend.com/service-name=%s") && + javaOpts.contains("-Dplay.server.pidfile.path=/dev/null")) }) } @@ -308,13 +309,14 @@ object DeploymentJsonTest extends TestSuite { javaOpts.contains("-Dakka.management.cluster.bootstrap.contact-point-discovery.service-name=friendimpl-internal") && javaOpts.contains("-Dakka.management.cluster.bootstrap.contact-point-discovery.port-name=management") && !javaOpts.contains("-Dakka.management.cluster.bootstrap.contact-point-discovery.effective-name=friendimpl") && - !javaOpts.contains("-Dakka.discovery.kubernetes-api.pod-label-selector=akka.lightbend.com/service-name=%s")) + !javaOpts.contains("-Dakka.discovery.kubernetes-api.pod-label-selector=akka.lightbend.com/service-name=%s") && + javaOpts.contains("-Dplay.server.pidfile.path=/dev/null")) }) } "should generate application health check given status module" - { val expectedJson = - """ + (""" |{ | "apiVersion": "apps/v1beta2", | "kind": "Deployment", @@ -418,7 +420,16 @@ object DeploymentJsonTest extends TestSuite { | }, | { | "name": "RP_JAVA_OPTS", - | "value": "-Dconfig.resource=my-config.conf -Dakka.management.cluster.bootstrap.contact-point-discovery.discovery-method=kubernetes-api -Dakka.management.cluster.bootstrap.contact-point-discovery.port-name=management -Dakka.management.cluster.bootstrap.contact-point-discovery.effective-name=friendimpl -Dakka.discovery.kubernetes-api.pod-label-selector=akka.lightbend.com/service-name=%s -Dakka.management.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=1" + | "value": """".stripMargin + + List( + "-Dconfig.resource=my-config.conf", + "-Dakka.management.cluster.bootstrap.contact-point-discovery.discovery-method=kubernetes-api", + "-Dakka.management.cluster.bootstrap.contact-point-discovery.port-name=management", + "-Dakka.management.cluster.bootstrap.contact-point-discovery.effective-name=friendimpl", + "-Dakka.discovery.kubernetes-api.pod-label-selector=akka.lightbend.com/service-name=%s", + "-Dakka.management.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=1", + "-Dplay.server.pidfile.path=/dev/null").mkString(" ") + + """" | }, | { | "name": "RP_KUBERNETES_POD_IP", @@ -471,7 +482,7 @@ object DeploymentJsonTest extends TestSuite { | } | } |} - """.stripMargin.parse.right.get + """.stripMargin).parse.right.get val result = Deployment.generate(annotations.copy( modules = Set("akka-management", "status", "akka-cluster-bootstrapping"), managementEndpointName = Some("management")), "apps/v1beta2", None, imageName, diff --git a/cli/shared/src/test/scala/com/lightbend/rp/reactivecli/runtime/marathon/RpEnvironmentVariablesTest.scala b/cli/shared/src/test/scala/com/lightbend/rp/reactivecli/runtime/marathon/RpEnvironmentVariablesTest.scala index a2d467c4..ed15b5f3 100644 --- a/cli/shared/src/test/scala/com/lightbend/rp/reactivecli/runtime/marathon/RpEnvironmentVariablesTest.scala +++ b/cli/shared/src/test/scala/com/lightbend/rp/reactivecli/runtime/marathon/RpEnvironmentVariablesTest.scala @@ -113,7 +113,13 @@ object RpEnvironmentVariablesTest extends TestSuite { Map( "RP_ENDPOINT_0_BIND_PORT" -> "$PORT_EP", "RP_ENDPOINTS" -> "EP1", "RP_APP_VERSION" -> "3.2.1-SNAPSHOT", - "RP_JAVA_OPTS" -> "-Dakka.management.cluster.bootstrap.contact-point-discovery.discovery-method=marathon-api -Dakka.management.cluster.bootstrap.contact-point-discovery.port-name=management -Dakka.management.cluster.bootstrap.contact-point-discovery.effective-name=friendimpl -Dakka.management.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=3 -Dakka.discovery.marathon-api.app-label-query=APP_NAME==%s", + "RP_JAVA_OPTS" -> List( + "-Dakka.management.cluster.bootstrap.contact-point-discovery.discovery-method=marathon-api", + "-Dakka.management.cluster.bootstrap.contact-point-discovery.port-name=management", + "-Dakka.management.cluster.bootstrap.contact-point-discovery.effective-name=friendimpl", + "-Dakka.management.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=3", + "-Dakka.discovery.marathon-api.app-label-query=APP_NAME==%s", + "-Dplay.server.pidfile.path=/dev/null").mkString(" "), "RP_PLATFORM" -> "mesos", "RP_ENDPOINT_EP1_PORT" -> "$PORT_EP", "RP_MODULES" -> "akka-cluster-bootstrapping", @@ -176,7 +182,10 @@ object RpEnvironmentVariablesTest extends TestSuite { "RP_ENDPOINT_EP1_HOST" -> "$HOST", "RP_ENDPOINT_EP1_BIND_HOST" -> "0.0.0.0", "RP_MODULES" -> "service-discovery", - "RP_JAVA_OPTS" -> "-Dcom.lightbend.platform-tooling.service-discovery.external-service-addresses.chirpservice.0=_chirpservice._tcp.marathon.mesos -Dcom.lightbend.platform-tooling.service-discovery.external-service-addresses.chirpservice.1=_chirpservice._udp.marathon.mesos -Dcom.lightbend.platform-tooling.service-discovery.external-service-addresses.friendservice.0=_friendservice._tcp.marathon.mesos") + "RP_JAVA_OPTS" -> List( + "-Dcom.lightbend.platform-tooling.service-discovery.external-service-addresses.chirpservice.0=_chirpservice._tcp.marathon.mesos", + "-Dcom.lightbend.platform-tooling.service-discovery.external-service-addresses.chirpservice.1=_chirpservice._udp.marathon.mesos", + "-Dcom.lightbend.platform-tooling.service-discovery.external-service-addresses.friendservice.0=_friendservice._tcp.marathon.mesos").mkString(" ")) val actual = RpEnvironmentVariables