Skip to content

Commit

Permalink
release-24.1: roachtest: disable zone config evacuation for v22.2 nodes
Browse files Browse the repository at this point in the history
Closes #132546.

No patch release of v22.2 and earlier has #114365, so they have the
potential to be flaky when evacuating nodes using zone configs. Don't
use zone config movement for these versions.

Release note: None
  • Loading branch information
nvanbenschoten committed Oct 14, 2024
1 parent 7b8cab9 commit 2fb06a8
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion pkg/cmd/roachtest/tests/mixed_version_change_replicas.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/roachtestutil/clusterupgrade"
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/roachtestutil/mixedversion"
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/test"
"github.com/cockroachdb/cockroach/pkg/roachpb"
"github.com/cockroachdb/cockroach/pkg/roachprod/install"
"github.com/cockroachdb/cockroach/pkg/roachprod/logger"
"github.com/cockroachdb/cockroach/pkg/testutils"
Expand Down Expand Up @@ -247,7 +248,16 @@ func runChangeReplicasMixedVersion(ctx context.Context, t test.Test, c cluster.C
})

for _, node := range nodes {
if r.Float64() < 0.5 {
// No patch release of v22.2 and earlier has #114365, so they have the
// potential to be flaky when evacuating nodes using zone configs. Don't
// use zone config movement for these versions.
bv, err := clusterupgrade.BinaryVersion(h.Connect(node))
if err != nil {
return errors.Wrapf(err, "failed to get binary version for node %d", node)
}
evacuateNodeUsingZoneConfigFlaky := bv.Less(roachpb.Version{Major: 23})

if r.Float64() < 0.5 && !evacuateNodeUsingZoneConfigFlaky {
if err := evacuateNodeUsingZoneConfig(ctx, l, r, h, node); err != nil {
return err
}
Expand Down

0 comments on commit 2fb06a8

Please sign in to comment.