From 7f6f289936c3843b7cb529d7ea1ee2cee35ce34b Mon Sep 17 00:00:00 2001
From: Xavier Vello <xavier.vello@datadoghq.com>
Date: Wed, 23 Jan 2019 10:50:01 +0100
Subject: [PATCH] Use the appropriate port when redirecting node-agents to
 leader (#2892)

---
 pkg/clusteragent/clusterchecks/api.go          | 3 ++-
 pkg/clusteragent/clusterchecks/api_test.go     | 6 ++++--
 pkg/clusteragent/clusterchecks/handler.go      | 2 ++
 pkg/clusteragent/clusterchecks/handler_test.go | 5 +++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkg/clusteragent/clusterchecks/api.go b/pkg/clusteragent/clusterchecks/api.go
index e68274c69ae956..7f583bf97a1ec2 100644
--- a/pkg/clusteragent/clusterchecks/api.go
+++ b/pkg/clusteragent/clusterchecks/api.go
@@ -8,6 +8,7 @@
 package clusterchecks
 
 import (
+	"fmt"
 	"net/http"
 
 	"github.com/DataDog/datadog-agent/pkg/clusteragent/clusterchecks/types"
@@ -28,7 +29,7 @@ func (h *Handler) ShouldHandle() (int, string) {
 	case leader:
 		return http.StatusOK, ""
 	case follower:
-		return http.StatusFound, h.leaderIP
+		return http.StatusFound, fmt.Sprintf("%s:%d", h.leaderIP, h.port)
 	default:
 		return http.StatusServiceUnavailable, notReadyReason
 	}
diff --git a/pkg/clusteragent/clusterchecks/api_test.go b/pkg/clusteragent/clusterchecks/api_test.go
index 0e86ee229519bd..3f51889fd102cf 100644
--- a/pkg/clusteragent/clusterchecks/api_test.go
+++ b/pkg/clusteragent/clusterchecks/api_test.go
@@ -15,7 +15,9 @@ import (
 )
 
 func TestShouldHandle(t *testing.T) {
-	h := &Handler{}
+	h := &Handler{
+		port: 5005,
+	}
 
 	// Initial state
 	code, reason := h.ShouldHandle()
@@ -33,5 +35,5 @@ func TestShouldHandle(t *testing.T) {
 	h.leaderIP = "1.2.3.4"
 	code, reason = h.ShouldHandle()
 	assert.Equal(t, http.StatusFound, code)
-	assert.Equal(t, "1.2.3.4", reason)
+	assert.Equal(t, "1.2.3.4:5005", reason)
 }
diff --git a/pkg/clusteragent/clusterchecks/handler.go b/pkg/clusteragent/clusterchecks/handler.go
index 594df501362165..ca00609a6c6501 100644
--- a/pkg/clusteragent/clusterchecks/handler.go
+++ b/pkg/clusteragent/clusterchecks/handler.go
@@ -53,6 +53,7 @@ type Handler struct {
 	m                    sync.RWMutex // Below fields protected by the mutex
 	state                state
 	leaderIP             string
+	port                 int
 }
 
 // NewHandler returns a populated Handler
@@ -67,6 +68,7 @@ func NewHandler(ac pluggableAutoConfig) (*Handler, error) {
 		warmupDuration:   config.Datadog.GetDuration("cluster_checks.warmup_duration") * time.Second,
 		leadershipChan:   make(chan state, 1),
 		dispatcher:       newDispatcher(),
+		port:             config.Datadog.GetInt("cluster_agent.cmd_port"),
 	}
 
 	if config.Datadog.GetBool("leader_election") {
diff --git a/pkg/clusteragent/clusterchecks/handler_test.go b/pkg/clusteragent/clusterchecks/handler_test.go
index 69b8864b0a71f1..46048947b6e452 100644
--- a/pkg/clusteragent/clusterchecks/handler_test.go
+++ b/pkg/clusteragent/clusterchecks/handler_test.go
@@ -141,6 +141,7 @@ func TestHandlerRun(t *testing.T) {
 		leadershipChan:       make(chan state, 1),
 		dispatcher:           newDispatcher(),
 		leaderStatusCallback: le.get,
+		port:                 5005,
 	}
 
 	//
@@ -179,7 +180,7 @@ func TestHandlerRun(t *testing.T) {
 	assertTrueBeforeTimeout(t, 10*time.Millisecond, 250*time.Millisecond, func() bool {
 		// API redirects to leader
 		code, reason := h.ShouldHandle()
-		return code == http.StatusFound && reason == "1.2.3.4"
+		return code == http.StatusFound && reason == "1.2.3.4:5005"
 	})
 
 	//
@@ -246,7 +247,7 @@ func TestHandlerRun(t *testing.T) {
 	assertTrueBeforeTimeout(t, 10*time.Millisecond, 250*time.Millisecond, func() bool {
 		// API redirects to leader again
 		code, reason := h.ShouldHandle()
-		return code == http.StatusFound && reason == "1.2.3.6"
+		return code == http.StatusFound && reason == "1.2.3.6:5005"
 	})
 	assertTrueBeforeTimeout(t, 10*time.Millisecond, 500*time.Millisecond, func() bool {
 		// RemoveScheduler is called