Skip to content

Commit eddf7cb

Browse files
craig[bot]DarrylWong
andcommitted
Merge #155713
155713: mixedversion: fix {cluster,binary}Version indexing papercut r=williamchoe3,herkolategan a=DarrylWong Before every step in mixed version tests, we make sure to refresh the framework's local knowledge of cluster/binary versions. However, we recently made sure to skip refreshing of nodes that are unavailable. This threw off the indexing when updating the versions. Fixes: none Epic: none Release note: none Co-authored-by: DarrylWong <[email protected]>
2 parents f2d1d9b + 301ff2f commit eddf7cb

File tree

1 file changed

+4
-4
lines changed
  • pkg/cmd/roachtest/roachtestutil/mixedversion

1 file changed

+4
-4
lines changed

pkg/cmd/roachtest/roachtestutil/mixedversion/runner.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ func (tr *testRunner) refreshBinaryVersions(ctx context.Context, service *servic
525525
defer cancel()
526526

527527
group := ctxgroup.WithContext(connectionCtx)
528-
for j, node := range tr.getAvailableNodes(service.descriptor) {
528+
for _, node := range tr.getAvailableNodes(service.descriptor) {
529529
group.GoCtx(func(ctx context.Context) error {
530530
bv, err := clusterupgrade.BinaryVersion(ctx, tr.conn(node, service.descriptor.Name))
531531
if err != nil {
@@ -534,7 +534,7 @@ func (tr *testRunner) refreshBinaryVersions(ctx context.Context, service *servic
534534
node, service.descriptor.Name, err,
535535
)
536536
}
537-
newBinaryVersions[j] = bv
537+
newBinaryVersions[node-1] = bv
538538
return nil
539539
})
540540
}
@@ -556,7 +556,7 @@ func (tr *testRunner) refreshClusterVersions(ctx context.Context, service *servi
556556
defer cancel()
557557

558558
group := ctxgroup.WithContext(connectionCtx)
559-
for j, node := range tr.getAvailableNodes(service.descriptor) {
559+
for _, node := range tr.getAvailableNodes(service.descriptor) {
560560
group.GoCtx(func(ctx context.Context) error {
561561
cv, err := clusterupgrade.ClusterVersion(ctx, tr.conn(node, service.descriptor.Name))
562562
if err != nil {
@@ -566,7 +566,7 @@ func (tr *testRunner) refreshClusterVersions(ctx context.Context, service *servi
566566
)
567567
}
568568

569-
newClusterVersions[j] = cv
569+
newClusterVersions[node-1] = cv
570570
return nil
571571
})
572572
}

0 commit comments

Comments
 (0)