Merge pull request #1051 from buyology/no-rack-on-find-coordinator-re…

…sponse remove rack from FindCoordinatorResponse
IBM · Feb 14, 2018 · bfaa60f · bfaa60f
2 parents 1995278 + 5a23d49
commit bfaa60f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/find_coordinator_response.go b/find_coordinator_response.go
@@ -38,7 +38,9 @@ func (f *FindCoordinatorResponse) decode(pd packetDecoder, version int16) (err e
 	}
 
 	coordinator := new(Broker)
-	if err := coordinator.decode(pd, version); err != nil {
+	// The version is hardcoded to 0, as version 1 of the Broker-decode
+	// contains the rack-field which is not present in the FindCoordinatorResponse.
+	if err := coordinator.decode(pd, 0); err != nil {
 		return err
 	}
 	if coordinator.addr == ":0" {
@@ -66,7 +68,7 @@ func (f *FindCoordinatorResponse) encode(pe packetEncoder) error {
 	if coordinator == nil {
 		coordinator = NoNode
 	}
-	if err := coordinator.encode(pe, f.Version); err != nil {
+	if err := coordinator.encode(pe, 0); err != nil {
 		return err
 	}
 	return nil

diff --git a/find_coordinator_response_test.go b/find_coordinator_response_test.go
@@ -7,7 +7,6 @@ import (
 
 func TestFindCoordinatorResponse(t *testing.T) {
 	errMsg := "kaboom"
-	brokerRack := "foo"
 
 	for _, tc := range []struct {
 		desc     string
@@ -38,7 +37,6 @@ func TestFindCoordinatorResponse(t *testing.T) {
 			Coordinator: &Broker{
 				id:   7,
 				addr: "host:9092",
-				rack: &brokerRack,
 			},
 		},
 		encoded: []byte{
@@ -48,7 +46,6 @@ func TestFindCoordinatorResponse(t *testing.T) {
 			0, 0, 0, 7, // Coordinator.ID
 			0, 4, 'h', 'o', 's', 't', // Coordinator.Host
 			0, 0, 35, 132, // Coordinator.Port
-			0, 3, 'f', 'o', 'o', // Coordinator.Rack
 		},
 	}, {
 		desc: "version 0 - error",
@@ -79,7 +76,6 @@ func TestFindCoordinatorResponse(t *testing.T) {
 			255, 255, 255, 255, // Coordinator.ID: -1
 			0, 0, // Coordinator.Host: ""
 			255, 255, 255, 255, // Coordinator.Port: -1
-			255, 255, // Coordinator.Rack: empty
 		},
 	}} {
 		testResponse(t, tc.desc, tc.response, tc.encoded)