@@ -17,6 +17,7 @@ import (
17
17
"strings"
18
18
"time"
19
19
20
+ "github.com/cockroachdb/cockroach/pkg/clusterversion"
20
21
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster"
21
22
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/option"
22
23
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/registry"
@@ -25,6 +26,7 @@ import (
25
26
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/roachtestutil/task"
26
27
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/spec"
27
28
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/test"
29
+ "github.com/cockroachdb/cockroach/pkg/roachpb"
28
30
"github.com/cockroachdb/cockroach/pkg/roachprod/install"
29
31
"github.com/cockroachdb/cockroach/pkg/roachprod/logger"
30
32
"github.com/cockroachdb/cockroach/pkg/roachprod/vm"
@@ -97,7 +99,7 @@ func registerFollowerReads(r registry.Registry) {
97
99
}()
98
100
99
101
rng , _ := randutil .NewPseudoRand ()
100
- data := initFollowerReadsDB (ctx , t , t .L (), c , connFunc , connFunc , rng , topology )
102
+ data := initFollowerReadsDB (ctx , t , t .L (), c , connFunc , connFunc , rng , topology , clusterversion . Latest . Version () )
101
103
runFollowerReadsTest (ctx , t , t .L (), c , connFunc , connFunc , rng , topology , rc , data )
102
104
},
103
105
})
@@ -488,6 +490,7 @@ func initFollowerReadsDB(
488
490
connectFunc , systemConnectFunc func (int ) * gosql.DB ,
489
491
rng * rand.Rand ,
490
492
topology topologySpec ,
493
+ clusterVersion roachpb.Version ,
491
494
) (data map [int ]int64 ) {
492
495
systemDB := systemConnectFunc (1 )
493
496
db := connectFunc (1 )
@@ -529,10 +532,12 @@ func initFollowerReadsDB(
529
532
530
533
// Disable schema_locked within this since it will modify locality on
531
534
// tables.
532
- _ , err = db .ExecContext (ctx , "SET create_table_with_schema_locked=false" )
533
- require .NoError (t , err )
534
- _ , err = db .ExecContext (ctx , "ALTER ROLE ALL SET create_table_with_schema_locked=false" )
535
- require .NoError (t , err )
535
+ if clusterVersion .AtLeast (clusterversion .V25_3 .Version ()) {
536
+ _ , err = db .ExecContext (ctx , "SET create_table_with_schema_locked=false" )
537
+ require .NoError (t , err )
538
+ _ , err = db .ExecContext (ctx , "ALTER ROLE ALL SET create_table_with_schema_locked=false" )
539
+ require .NoError (t , err )
540
+ }
536
541
537
542
// Create a multi-region database and table.
538
543
_ , err = db .ExecContext (ctx , `CREATE DATABASE mr_db` )
@@ -1075,7 +1080,9 @@ func runFollowerReadsMixedVersionTest(
1075
1080
}
1076
1081
}
1077
1082
1078
- data = initFollowerReadsDB (ctx , t , l , c , h .Connect , h .System .Connect , r , topology )
1083
+ version , err := h .ClusterVersion (r )
1084
+ require .NoError (t , err )
1085
+ data = initFollowerReadsDB (ctx , t , l , c , h .Connect , h .System .Connect , r , topology , version )
1079
1086
return nil
1080
1087
}
1081
1088
0 commit comments