homelab/traefik
1
0
Fork 0
Code Activity

Remove health check filter from Marathon tasks.

Browse source
This commit is contained in:
Timo Reimann 2018-02-13 08:00:05 +01:00 • committed by Traefiker Bot
parent 7d3dd5a0e4
commit 17e85e31cd
3 changed files with 0 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

12
provider/marathon/config.go
View file

@ -153,18 +153,6 @@ func (p *Provider) taskFilter(task marathon.Task, application marathon.Applicati
return false
}
// Filter task with existing, bad health check results.
if application.HasHealthChecks() {
if task.HasHealthCheckResults() {
for _, healthCheck := range task.HealthCheckResults {
if !healthCheck.Alive {
log.Debugf("Filtering Marathon task %s from application %s with bad health check", task.ID, application.ID)
return false
}
}
}
}
if ready := p.readyChecker.Do(task, application); !ready {
log.Infof("Filtering unready task %s from application %s", task.ID, application.ID)
return false

45
provider/marathon/config_test.go
View file

@ -935,51 +935,6 @@ func TestTaskFilter(t *testing.T) {
),
expected: true,
},
{
desc: "healthcheck available",
task: task(taskPorts(80)),
application: application(
appPorts(80),
healthChecks(marathon.NewDefaultHealthCheck()),
),
expected: true,
},
{
desc: "healthcheck result false",
task: task(
taskPorts(80),
healthCheckResultLiveness(false),
),
application: application(
appPorts(80),
healthChecks(marathon.NewDefaultHealthCheck()),
),
expected: false,
},
{
desc: "healthcheck results mixed",
task: task(
taskPorts(80),
healthCheckResultLiveness(true, false),
),
application: application(
appPorts(80),
healthChecks(marathon.NewDefaultHealthCheck()),
),
expected: false,
},
{
desc: "healthcheck result true",
task: task(
taskPorts(80),
healthCheckResultLiveness(true),
),
application: application(
appPorts(80),
healthChecks(marathon.NewDefaultHealthCheck()),
),
expected: true,
},
{
desc: "readiness check false",
task: task(taskPorts(80)),