HomeMesosphereNo notifications. 4 unresolved issues.
  • Search
Differential D30

Correct the host port when using http health checks
AbandonedAll Users
Actions

Authored by • jasongilanfarr on Sep 28 2016, 2:10 AM.

Details

Reviewers
aquamatthias
jdef
unterstein
Commits
rMARATHON77b6b4ca2f90: Correct the host port when using http health checks
rMARATHON13a7d30a3d7a: Correct the host port when using http health checks
rMARATHON7e442179eaad: Merge 13a7d30a3d7a4966d2eedb4b1e4614170c751e7e into…
Summary
  • Now that everything is validated, we should be able to reliably fill in the host port correctly - DCOS-10021
Test Plan

Used the following json and checked the status after

{
  "id": "/podz/pod",
  "labels": {
    "values": {}
  },
  "version": "2016-09-27T21:29:28.397Z",
  "user": null,
  "environment": null,
  "containers": [
    {
      "name": "container1",
      "exec": {
        "command": {
          "shell": "sleep 100"
        },
        "overrideEntrypoint": false
      },
      "resources": {
        "cpus": 1,
        "mem": 128,
        "disk": 0,
        "gpus": 0
      },
      "endpoints": [
        {
          "name": "http",
          "containerPort": 1,
          "hostPort": 0,
          "protocol": ["tcp"],
          "labels": {
            "values": {}
          }
        }
      ],
      "image": {
        "kind": "docker",
        "id": "mesosphere/mesos-slave:latest",
        "forcePull": false
      },
      "environment": null,
      "user": "root",
      "healthCheck": {
        "http": {
          "endpoint": "http",
          "path": "/health",
          "scheme": "http"
        },
        "gracePeriodSeconds": 30,
        "intervalSeconds": 2,
        "maxConsecutiveFailures": 3,
        "timeoutSeconds": 20,
        "delaySeconds": 2
      },
      "volumeMounts": [],
      "artifacts": [],
      "labels": null,
      "lifecycle": {
        "killGracePeriodSeconds": 60
      }
    }
  ],
  "secrets": null,
  "volumes": [],
  "networks": [
    {
      "mode": "host"
    }
  ],
  "scaling": {
    "kind": "fixed",
    "instances": 1,
    "maxInstances": null
  },
  "scheduling": {
    "backoff": {
      "backoff": 1,
      "backoffFactor": 1.15,
      "maxLaunchDelay": 3600
    },
    "upgrade": {
      "minimumHealthCapacity": 1,
      "maximumOverCapacity": 1
    },
    "placement": {
      "constraints": [],
      "acceptedResourceRoles": []
    }
  }
}

Diff Detail

Repository
rMARATHON marathon
Branch
jason/pod-health-check-proto
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 47
Build 47: arc lint + arc unit
• jasongilanfarr retitled this revision from to Correct the host port when using http health checks.Sep 28 2016, 2:10 AM
• jasongilanfarr updated this object.
• jasongilanfarr edited the test plan for this revision. (Show Details)
• jasongilanfarr added reviewers: jdef, aquamatthias, unterstein.
• jasongilanfarr added a subscriber: marathon-team.
• jasongilanfarr abandoned this revision.Sep 28 2016, 5:12 PM

Already merged into feature/pods

Revision Contents

Diff 51

View Options

src/main/scala/mesosphere/mesos/TaskGroupBuilder.scala

Show First 20 Lines • Show All 80 Lines • ▼ Show 20 Line(s)
8181
8282 val envPrefix: Option[String] = config.envVarsPrefix
8383
8484 val portsEnvVars = portEnvVars(allEndpoints, resourceMatch.hostPorts, envPrefix)
8585
8686 val taskGroup = mesos.TaskGroupInfo.newBuilder
8787
8888 podDefinition.containers
89 .map(computeTaskInfo(_, podDefinition, offer, instanceId, portsEnvVars))
89 .map(computeTaskInfo(_, podDefinition, offer, instanceId, resourceMatch.hostPorts, portsEnvVars))
9090 .foreach(taskGroup.addTasks)
9191
9292 // call all configured run spec customizers here (plugin)
9393 runSpecTaskProcessor.taskGroup(podDefinition, taskGroup)
9494
9595 Some((executorInfo.build, taskGroup.build, resourceMatch.hostPorts, instanceId))
9696 }
9797
Show All 29 Lines
127127 }.flatten
128128 }
129129
130130 private[this] def computeTaskInfo(
131131 container: MesosContainer,
132132 podDefinition: PodDefinition,
133133 offer: mesos.Offer,
134134 instanceId: Instance.Id,
135 hostPorts: Seq[Option[Int]],
135136 portsEnvVars: Map[String, String]): mesos.TaskInfo.Builder = {
136137 val builder = mesos.TaskInfo.newBuilder
137138 .setName(container.name)
138139 .setTaskId(mesos.TaskID.newBuilder.setValue(Task.Id.forInstanceId(instanceId, Some(container)).idString))
139140 .setSlaveId(offer.getSlaveId)
140141
141142 builder.addResources(scalarResource("cpus", container.resources.cpus))
142143 builder.addResources(scalarResource("mem", container.resources.mem))
Show All 14 Lines
157158 portsEnvVars)
158159
159160 builder.setCommand(commandInfo)
160161
161162 computeContainerInfo(podDefinition.podVolumes, container)
162163 .foreach(builder.setContainer)
163164
164165 container.healthCheck.foreach { healthCheck =>
165 builder.setHealthCheck(computeHealthCheck(healthCheck, container.endpoints))
166 builder.setHealthCheck(computeHealthCheck(healthCheck, container.endpoints, hostPorts))
166167 }
167168
168169 builder
169170 }
170171
171172 private[this] def computeExecutorInfo(
172173 podDefinition: PodDefinition,
173174 portsMatch: PortsMatch,
Show All 9 Lines
183184
184185 executorInfo.addResources(scalarResource("cpus", PodDefinition.DefaultExecutorResources.cpus))
185186 executorInfo.addResources(scalarResource("mem", PodDefinition.DefaultExecutorResources.mem))
186187 executorInfo.addResources(scalarResource("disk", PodDefinition.DefaultExecutorResources.disk))
187188 executorInfo.addResources(scalarResource("gpus", PodDefinition.DefaultExecutorResources.gpus.toDouble))
188189 executorInfo.addAllResources(portsMatch.resources.asJava)
189190
190191 def toMesosLabels(labels: Map[String, String]): mesos.Labels.Builder = {
191 labels
192 .map{
192 labels.map{
193193 case (key, value) =>
194194 mesos.Label.newBuilder.setKey(key).setValue(value)
195 }
196 .foldLeft(mesos.Labels.newBuilder) { (builder, label) =>
195 }.foldLeft(mesos.Labels.newBuilder) { (builder, label) =>
197196 builder.addLabels(label)
198197 }
199198 }
200199
201200 if (podDefinition.networks.nonEmpty) {
202201 val containerInfo = mesos.ContainerInfo.newBuilder
203202 .setType(mesos.ContainerInfo.Type.MESOS)
204203
▲ Show 20 Lines • Show All 132 Lines • ▼ Show 20 Line(s)
337336 None
338337 } else {
339338 Some(containerInfo)
340339 }
341340 }
342341
343342 private[this] def computeHealthCheck(
344343 healthCheck: raml.HealthCheck,
345 endpoints: Seq[raml.Endpoint]): mesos.HealthCheck.Builder = {
344 endpoints: Seq[raml.Endpoint],
345 hostPorts: Seq[Option[Int]]): mesos.HealthCheck.Builder = {
346346 val builder = mesos.HealthCheck.newBuilder
347347 builder.setDelaySeconds(healthCheck.delaySeconds.toDouble)
348348 builder.setGracePeriodSeconds(healthCheck.gracePeriodSeconds.toDouble)
349349 builder.setIntervalSeconds(healthCheck.intervalSeconds.toDouble)
350350 builder.setConsecutiveFailures(healthCheck.maxConsecutiveFailures)
351351 builder.setTimeoutSeconds(healthCheck.timeoutSeconds.toDouble)
352352
353353 healthCheck.command.foreach { command =>
Show All 14 Lines
368368 builder.setCommand(commandInfo)
369369 }
370370
371371 healthCheck.http.foreach { http =>
372372 builder.setType(mesos.HealthCheck.Type.HTTP)
373373
374374 val httpCheckInfo = mesos.HealthCheck.HTTPCheckInfo.newBuilder
375375
376 endpoints.find(_.name == http.endpoint).foreach{ endpoint =>
376 assume(endpoints.size == hostPorts.size)
377 val index = endpoints.indexWhere(_.name == http.endpoint)
378 assume(index != -1)
377379 // TODO: determine if not in "HOST" mode and use the container port instead
378 endpoint.hostPort.foreach(httpCheckInfo.setPort)
379 }
380 hostPorts(index).foreach(httpCheckInfo.setPort)
380381
381382 http.scheme.foreach(scheme => httpCheckInfo.setScheme(scheme.value))
382383 http.path.foreach(httpCheckInfo.setPath)
383384
384385 builder.setHttp(httpCheckInfo)
385386 }
386387
387388 healthCheck.tcp.foreach { tcp =>
▲ Show 20 Lines • Show All 58 Lines • Show Last 20 Lines