From 3c7c6c4d9f21483817f956face6cc205dae5cf70 Mon Sep 17 00:00:00 2001 From: Nimi Wariboko Jr Date: Wed, 20 Dec 2017 03:12:03 -0800 Subject: [PATCH] Mesos: Use slave.PID.Host as task SlaveIP. --- provider/mesos/mesos.go | 2 +- provider/mesos/mesos_test.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/provider/mesos/mesos.go b/provider/mesos/mesos.go index 46f7d33f7..69a9bff2f 100644 --- a/provider/mesos/mesos.go +++ b/provider/mesos/mesos.go @@ -408,7 +408,7 @@ func (p *Provider) taskRecords(sj state.State) []state.Task { for _, task := range f.Tasks { for _, slave := range sj.Slaves { if task.SlaveID == slave.ID { - task.SlaveIP = slave.Hostname + task.SlaveIP = slave.PID.Host } } diff --git a/provider/mesos/mesos_test.go b/provider/mesos/mesos_test.go index 95bb8a3e6..34f7f8fc2 100644 --- a/provider/mesos/mesos_test.go +++ b/provider/mesos/mesos_test.go @@ -6,6 +6,7 @@ import ( "github.com/containous/traefik/log" "github.com/containous/traefik/types" + "github.com/mesos/mesos-go/upid" "github.com/mesosphere/mesos-dns/records/state" ) @@ -194,6 +195,9 @@ func TestTaskRecords(t *testing.T) { ID: "s_id", Hostname: "127.0.0.1", } + + slave.PID.UPID = &upid.UPID{} + slave.PID.Host = slave.Hostname var state = state.State{ Slaves: []state.Slave{slave}, Frameworks: []state.Framework{framework},