status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Deflake the catalog v2beta1 integration tests (#20278)

This commit is contained in:
Matt Keeler 2024-01-19 10:49:47 -05:00 committed by GitHub
parent fe678e9da1
commit cee9df574d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
internal/catalog/catalogtest/test_integration_v2beta1.go
View File

@ -19,6 +19,7 @@ import (
"github.com/hashicorp/consul/proto-public/pbresource" "github.com/hashicorp/consul/proto-public/pbresource"
"github.com/hashicorp/consul/proto/private/prototest" "github.com/hashicorp/consul/proto/private/prototest"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/sdk/testutil/retry"
) )
var ( var (
@ -62,26 +63,37 @@ func VerifyCatalogV2Beta1IntegrationTestResults(t *testing.T, client pbresource.
c := rtest.NewClient(client) c := rtest.NewClient(client)
testutil.RunStep(t, "resources-exist", func(t *testing.T) { testutil.RunStep(t, "resources-exist", func(t *testing.T) {
c.RequireResourceExists(t, rtest.Resource(pbcatalog.ServiceType, "api").ID()) // When this test suite is run against multiple servers with the resource service client
c.RequireResourceExists(t, rtest.Resource(pbcatalog.ServiceType, "http-api").ID()) // pointed at a Raft follower, there can be a race between Raft replicating all the data
c.RequireResourceExists(t, rtest.Resource(pbcatalog.ServiceType, "grpc-api").ID()) // to the followers and these verifications running. Instead of wrapping each one of these
c.RequireResourceExists(t, rtest.Resource(pbcatalog.ServiceType, "foo").ID()) // in their own Wait/Retry func the whole set of them is being wrapped.
retry.Run(t, func(r *retry.R) {
c.RequireResourceExists(r, rtest.Resource(pbcatalog.ServiceType, "api").ID())
c.RequireResourceExists(r, rtest.Resource(pbcatalog.ServiceType, "http-api").ID())
c.RequireResourceExists(r, rtest.Resource(pbcatalog.ServiceType, "grpc-api").ID())
c.RequireResourceExists(r, rtest.Resource(pbcatalog.ServiceType, "foo").ID())
for i := 1; i < 5; i++ { for i := 1; i < 5; i++ {
nodeId := rtest.Resource(pbcatalog.NodeType, fmt.Sprintf("node-%d", i)).WithTenancy(resource.DefaultPartitionedTenancy()).ID() nodeId := rtest.Resource(pbcatalog.NodeType, fmt.Sprintf("node-%d", i)).WithTenancy(resource.DefaultPartitionedTenancy()).ID()
c.RequireResourceExists(t, nodeId) c.RequireResourceExists(r, nodeId)
res := c.RequireResourceExists(t, rtest.Resource(pbcatalog.NodeHealthStatusType, fmt.Sprintf("node-%d-health", i)).ID()) res := c.RequireResourceExists(r, rtest.Resource(pbcatalog.NodeHealthStatusType, fmt.Sprintf("node-%d-health", i)).ID())
rtest.RequireOwner(t, res, nodeId, true) rtest.RequireOwner(r, res, nodeId, true)
} }
for i := 1; i < 21; i++ { for i := 1; i < 21; i++ {
workloadId := rtest.Resource(pbcatalog.WorkloadType, fmt.Sprintf("api-%d", i)).WithTenancy(resource.DefaultNamespacedTenancy()).ID() workloadId := rtest.Resource(pbcatalog.WorkloadType, fmt.Sprintf("api-%d", i)).WithTenancy(resource.DefaultNamespacedTenancy()).ID()
c.RequireResourceExists(t, workloadId) c.RequireResourceExists(r, workloadId)
res := c.RequireResourceExists(t, rtest.Resource(pbcatalog.HealthStatusType, fmt.Sprintf("api-%d-health", i)).ID()) res := c.RequireResourceExists(r, rtest.Resource(pbcatalog.HealthStatusType, fmt.Sprintf("api-%d-health", i)).ID())
rtest.RequireOwner(t, res, workloadId, true) rtest.RequireOwner(r, res, workloadId, true)
} }
},
// Using a 2 second retry because Raft replication really ought to be this fast for our integration
// tests and if the test hardware cannot get 100 logs replicated to all followers in 2 seconds or
// less then we have some serious issues that warrant investigation.
retry.WithRetryer(retry.TwoSeconds()),
)
}) })
testutil.RunStep(t, "node-health-reconciliation", func(t *testing.T) { testutil.RunStep(t, "node-health-reconciliation", func(t *testing.T) {