[Streaming] Properly filters node-meta queries on health

This wil fix https://github.com/hashicorp/consul/issues/9730
This commit is contained in:
Pierre Souchay 2021-02-08 17:53:18 +01:00
parent c466b08481
commit cec640a1f2
2 changed files with 92 additions and 40 deletions

View File

@ -8,6 +8,7 @@ import (
"net/http/httptest" "net/http/httptest"
"net/url" "net/url"
"reflect" "reflect"
"strconv"
"testing" "testing"
"github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/structs"
@ -733,54 +734,90 @@ func TestHealthServiceNodes_NodeMetaFilter(t *testing.T) {
} }
t.Parallel() t.Parallel()
a := NewTestAgent(t, "")
defer a.Shutdown()
testrpc.WaitForLeader(t, a.RPC, "dc1")
req, _ := http.NewRequest("GET", "/v1/health/service/consul?dc=dc1&node-meta=somekey:somevalue", nil) tests := []struct {
resp := httptest.NewRecorder() name string
obj, err := a.srv.HealthServiceNodes(resp, req) config string
if err != nil { }{
t.Fatalf("err: %v", err) {"normal", ""},
{"cache-with-streaming", `
rpc{
enable_streaming=true
}
use_streaming_backend=true
`},
} }
for _, tst := range tests {
t.Run(tst.name, func(t *testing.T) {
assertIndex(t, resp) a := NewTestAgent(t, tst.config)
defer a.Shutdown()
testrpc.WaitForLeader(t, a.RPC, "dc1")
// Should be a non-nil empty list req, _ := http.NewRequest("GET", "/v1/health/service/consul?dc=dc1&node-meta=somekey:somevalue", nil)
nodes := obj.(structs.CheckServiceNodes) resp := httptest.NewRecorder()
if nodes == nil || len(nodes) != 0 { obj, err := a.srv.HealthServiceNodes(resp, req)
t.Fatalf("bad: %v", obj) if err != nil {
} t.Fatalf("err: %v", err)
}
args := &structs.RegisterRequest{ assertIndex(t, resp)
Datacenter: "dc1",
Node: "bar",
Address: "127.0.0.1",
NodeMeta: map[string]string{"somekey": "somevalue"},
Service: &structs.NodeService{
ID: "test",
Service: "test",
},
}
var out struct{} cIndex, err := strconv.ParseUint(resp.Header().Get("X-Consul-Index"), 10, 64)
if err := a.RPC("Catalog.Register", args, &out); err != nil { require.NoError(t, err)
t.Fatalf("err: %v", err)
}
req, _ = http.NewRequest("GET", "/v1/health/service/test?dc=dc1&node-meta=somekey:somevalue", nil) // Should be a non-nil empty list
resp = httptest.NewRecorder() nodes := obj.(structs.CheckServiceNodes)
obj, err = a.srv.HealthServiceNodes(resp, req) if nodes == nil || len(nodes) != 0 {
if err != nil { t.Fatalf("bad: %v", obj)
t.Fatalf("err: %v", err) }
}
assertIndex(t, resp) args := &structs.RegisterRequest{
Datacenter: "dc1",
Node: "bar",
Address: "127.0.0.1",
NodeMeta: map[string]string{"somekey": "somevalue"},
Service: &structs.NodeService{
ID: "test",
Service: "test",
},
}
// Should be a non-nil empty list for checks var out struct{}
nodes = obj.(structs.CheckServiceNodes) if err := a.RPC("Catalog.Register", args, &out); err != nil {
if len(nodes) != 1 || nodes[0].Checks == nil || len(nodes[0].Checks) != 0 { t.Fatalf("err: %v", err)
t.Fatalf("bad: %v", obj) }
args = &structs.RegisterRequest{
Datacenter: "dc1",
Node: "bar2",
Address: "127.0.0.1",
NodeMeta: map[string]string{"somekey": "othervalue"},
Service: &structs.NodeService{
ID: "test2",
Service: "test",
},
}
if err := a.RPC("Catalog.Register", args, &out); err != nil {
t.Fatalf("err: %v", err)
}
req, _ = http.NewRequest("GET", fmt.Sprintf("/v1/health/service/test?dc=dc1&node-meta=somekey:somevalue&index=%d&wait=10ms", cIndex), nil)
resp = httptest.NewRecorder()
obj, err = a.srv.HealthServiceNodes(resp, req)
if err != nil {
t.Fatalf("err: %v", err)
}
assertIndex(t, resp)
// Should be a non-nil empty list for checks
nodes = obj.(structs.CheckServiceNodes)
if len(nodes) != 1 || nodes[0].Checks == nil || len(nodes[0].Checks) != 0 {
t.Fatalf("bad: %v", obj)
}
})
} }
} }

View File

@ -71,7 +71,7 @@ func (c *Client) getServiceNodes(
panic("wrong response type for cachetype.HealthServicesName") panic("wrong response type for cachetype.HealthServicesName")
} }
return filterTags(value, req), md, nil return filterTags(filterNodeMeta(value, req), req), md, nil
} }
func filterTags(out *structs.IndexedCheckServiceNodes, req structs.ServiceSpecificRequest) structs.IndexedCheckServiceNodes { func filterTags(out *structs.IndexedCheckServiceNodes, req structs.ServiceSpecificRequest) structs.IndexedCheckServiceNodes {
@ -126,3 +126,18 @@ func serviceTagFilter(sn *structs.NodeService, tag string) bool {
// If we didn't hit the tag above then we should filter. // If we didn't hit the tag above then we should filter.
return true return true
} }
func filterNodeMeta(out *structs.IndexedCheckServiceNodes, req structs.ServiceSpecificRequest) *structs.IndexedCheckServiceNodes {
if len(req.NodeMetaFilters) == 0 || len(out.Nodes) == 0 {
return out
}
results := make(structs.CheckServiceNodes, 0, len(out.Nodes))
for _, service := range out.Nodes {
serviceNode := service.Node
if structs.SatisfiesMetaFilters(serviceNode.Meta, req.NodeMetaFilters) {
results = append(results, service)
}
}
out.Nodes = results
return out
}