Skip to content

Commit

Permalink
partitionccl: modify partitioning tests to use more replicas
Browse files Browse the repository at this point in the history
This changes the partitioning tests to use 9 replicas rather than 3 and
specifies lease_preferences in addition to constraints to allow the same
types of scans to work.

This test was intended to help catch errors cockroachdb#40751 but somehow seems to
reproduce cockroachdb#40213 even
on master.

```
I190918 05:26:52.501218 53874 storage/replica_gc_queue.go:286  [n1,replicaGC,s1,r14/1:/Table/1{8-9}] destroying local data
I190918 05:26:52.501282 53874 storage/store.go:2613  [n1,replicaGC,s1,r14/1:/Table/1{8-9}] removing replica r14/1
I190918 05:26:52.502818 53874 storage/replica_destroy.go:152  [n1,replicaGC,s1,r14/1:/Table/1{8-9}] removed 12 (0+12) keys in 1ms [clear=0ms commit=0ms]
I190918 05:26:56.941153 80013 storage/replica_command.go:1580  [n4,replicate,s4,r14/10:/Table/1{8-9}] change replicas (add [(n1,s1):12LEARNER] remove []): existing descriptor r14:/Table/1{8-9} [(n6,s6):11, (n9,s9):2, (n8,s8):9, (n2,s2):7, (n4,s4):10, next=12, gen=26]
F190918 05:26:57.019170 154 storage/store.go:4053  [n1,s1] found non-zero HardState.Commit on uninitialized replica [n1,s1,r14/?:{-}]. HS={Term:7 Vote:10 Commit:75 XXX_unrecognized:[]}
...
```

This reproduction occurs readily on this branch running roachprod stress:

```
make roachprod-stress CLUSTER=$USER-stress-2 PKG=./pkg/ccl/partitionccl TESTS=TestRepartitioning
```

Release note: None
  • Loading branch information
ajwerner committed Sep 18, 2019
1 parent 6c508db commit f0341d6
Showing 1 changed file with 47 additions and 15 deletions.
62 changes: 47 additions & 15 deletions pkg/ccl/partitionccl/partition_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
gosql "database/sql"
"fmt"
"math/rand"
"strconv"
"strings"
"testing"
"time"
Expand Down Expand Up @@ -142,13 +143,13 @@ func (pt *partitioningTest) parse() error {
var zoneConfigStmts bytes.Buffer
// TODO(dan): Can we run all the zoneConfigStmts in a txn?
for _, c := range pt.configs {
var subzoneShort, constraints string
var subzoneShort, leasePreferences string
configParts := strings.Split(c, `:`)
switch len(configParts) {
case 1:
subzoneShort = configParts[0]
case 2:
subzoneShort, constraints = configParts[0], configParts[1]
subzoneShort, leasePreferences = configParts[0], configParts[1]
default:
panic(errors.Errorf("unsupported config: %s", c))
}
Expand Down Expand Up @@ -177,16 +178,19 @@ func (pt *partitioningTest) parse() error {
return errors.Wrapf(err, "could not find index %s", indexName)
}
subzone.IndexID = uint32(idxDesc.ID)
constraints := strings.Replace(leasePreferences, "n", "zone=dc", -1)
if len(constraints) > 0 {
if subzone.PartitionName == "" {
fmt.Fprintf(&zoneConfigStmts,
`ALTER INDEX %s@%s CONFIGURE ZONE USING constraints = '[%s]';`,
pt.parsed.tableName, idxDesc.Name, constraints,
`ALTER INDEX %s@%s CONFIGURE ZONE USING constraints = '[%s]', lease_preferences = '[[%q]]';
`,
pt.parsed.tableName, idxDesc.Name, constraints, leasePreferences,
)
} else {
fmt.Fprintf(&zoneConfigStmts,
`ALTER PARTITION %s OF INDEX %s@%s CONFIGURE ZONE USING constraints = '[%s]';`,
subzone.PartitionName, pt.parsed.tableName, idxDesc.Name, constraints,
`ALTER PARTITION %s OF INDEX %s@%s CONFIGURE ZONE USING constraints = '[%s]', lease_preferences = '[[%s]]';
`,
subzone.PartitionName, pt.parsed.tableName, idxDesc.Name, constraints, leasePreferences,
)
}
}
Expand All @@ -197,6 +201,15 @@ func (pt *partitioningTest) parse() error {
}
subzone.Config.Constraints = parsedConstraints.Constraints
subzone.Config.InheritedConstraints = parsedConstraints.Inherited
var parsedLeasePreferences config.ConstraintsList
if err := yaml.UnmarshalStrict([]byte("["+leasePreferences+"]"), &parsedLeasePreferences); err != nil {
return errors.Wrapf(err, "parsing lease preferences: %s", constraints)
}
for _, c := range parsedLeasePreferences.Constraints {
subzone.Config.LeasePreferences = append(subzone.Config.LeasePreferences,
config.LeasePreference{Constraints: c.Constraints})
}
subzone.Config.InheritedLeasePreferences = parsedLeasePreferences.Inherited

pt.parsed.subzones = append(pt.parsed.subzones, subzone)
}
Expand Down Expand Up @@ -1095,7 +1108,8 @@ func verifyScansOnNode(
}
traceLines = append(traceLines, traceLine.String)
if strings.Contains(traceLine.String, "read completed") {
if strings.Contains(traceLine.String, "SystemCon") {
if strings.Contains(traceLine.String, "SystemCon") ||
strings.Contains(traceLine.String, "Min-") {
// Ignore trace lines for the system config range (abbreviated as
// "SystemCon" in pretty printing of the range descriptor). A read might
// be performed to the system config range to update the table lease.
Expand Down Expand Up @@ -1123,9 +1137,9 @@ func setupPartitioningTestCluster(
ctx context.Context, t testing.TB,
) (*gosql.DB, *sqlutils.SQLRunner, func()) {
cfg := config.DefaultZoneConfig()
cfg.NumReplicas = proto.Int32(1)
cfg.NumReplicas = proto.Int32(3)

tsArgs := func(attr string) base.TestServerArgs {
tsArgs := func(attr, locality string) base.TestServerArgs {
return base.TestServerArgs{
Knobs: base.TestingKnobs{
Store: &storage.StoreTestingKnobs{
Expand All @@ -1142,14 +1156,31 @@ func setupPartitioningTestCluster(
{InMemory: true, Attributes: roachpb.Attributes{Attrs: []string{attr}}},
},
UseDatabase: "data",
Locality: roachpb.Locality{
Tiers: []roachpb.Tier{
{
Key: "zone",
Value: locality,
},
},
},
}
}
const numNodes = 9
const datacenters = 3
tcArgs := func(numNodes int) base.TestClusterArgs {
serverArgs := make(map[int]base.TestServerArgs)
for i := 0; i < numNodes; i++ {
serverArgs[i] = tsArgs(
"n"+strconv.Itoa(i+1),
"dc"+strconv.Itoa((i%datacenters)+1),
)
}
return base.TestClusterArgs{
ServerArgsPerNode: serverArgs,
}
}
tcArgs := base.TestClusterArgs{ServerArgsPerNode: map[int]base.TestServerArgs{
0: tsArgs("n1"),
1: tsArgs("n2"),
2: tsArgs("n3"),
}}
tc := testcluster.StartTestCluster(t, 3, tcArgs)
tc := testcluster.StartTestCluster(t, numNodes, tcArgs(numNodes))

sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
sqlDB.Exec(t, `CREATE DATABASE data`)
Expand Down Expand Up @@ -1302,6 +1333,7 @@ func TestRepartitioning(t *testing.T) {
t.Fatalf("%+v", err)
}
sqlDB.Exec(t, test.old.parsed.createStmt)
fmt.Println(test.old.parsed.zoneConfigStmts)
sqlDB.Exec(t, test.old.parsed.zoneConfigStmts)

testutils.SucceedsSoon(t, test.old.verifyScansFn(ctx, t, db))
Expand Down

0 comments on commit f0341d6

Please sign in to comment.