Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
108111: changefeedccl: enable changefeed tests on ARM r=samiskin a=samiskin

Resolves #103888

This change enables all changefeed tests on ARM except for the Kafka OAuth test.  There are only Kafka 3 ARM binaries available, but the OAuth test requires Kafka 2 for the broker setup so just that test is exempted from ARM..

Release note: None

108339: kv: fix Replica stringer and SafeFormatter implementations r=erikgrinaker a=nvanbenschoten

This commit fixes the Replica stringer and SafeFormatter implementations so that they correctly include the range descriptor string. This was unintentionally broken by 897d6e, which changed the return value of `atomicDescString.get`.

Before this change, the stringer implementation looked something like:
```
[n1,s2,r&{3/4:{a-b} 3/4:{a-b} 3/4}]
```
The confusing `&{...}` portion was the internal structure `atomicDescInfo`.

After, it looks like:
```
[n1,s2,r3/4:{a-b}]
```

Epic: None
Release note: None

108346: rttanalysis: relax expected range for drop_3_roles r=rafiss a=rafiss

This test is mostly meant to assert an uppser bound, so a lower number is better. Some runs of the test in CI take 43 round trips.

fixes #108322
backport fixes #108292
Release note: None

Co-authored-by: Shiranka Miskin <[email protected]>
Co-authored-by: Nathan VanBenschoten <[email protected]>
Co-authored-by: Rafi Shamim <[email protected]>
  • Loading branch information
4 people committed Aug 8, 2023
4 parents 10fac80 + a6ac637 + 5aef86c + fe28c37 commit 4c39761
Show file tree
Hide file tree
Showing 6 changed files with 222 additions and 190 deletions.
2 changes: 1 addition & 1 deletion pkg/bench/rttanalysis/testdata/benchmark_expectations
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ exp,benchmark
17,DropDatabase/drop_database_3_tables
26,DropRole/drop_1_role
36,DropRole/drop_2_roles
45,DropRole/drop_3_roles
42-45,DropRole/drop_3_roles
15,DropSequence/drop_1_sequence
17,DropSequence/drop_2_sequences
19,DropSequence/drop_3_sequences
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/roachtest/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ func MachineTypeToCPUs(s string) int {
if _, err := fmt.Sscanf(s, "n2-standard-%d", &v); err == nil {
return v
}
if _, err := fmt.Sscanf(s, "n2-standard-%d", &v); err == nil {
if _, err := fmt.Sscanf(s, "t2a-standard-%d", &v); err == nil {
return v
}
if _, err := fmt.Sscanf(s, "n2-highcpu-%d", &v); err == nil {
Expand Down
6 changes: 6 additions & 0 deletions pkg/cmd/roachtest/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,12 @@ func TestClusterMachineType(t *testing.T) {
{"n2-standard-32", 32},
{"n2-standard-64", 64},
{"n2-standard-96", 96},
{"t2a-standard-2", 2},
{"t2a-standard-4", 4},
{"t2a-standard-8", 8},
{"t2a-standard-16", 16},
{"t2a-standard-32", 32},
{"t2a-standard-48", 48},
}
for _, tc := range testCases {
t.Run(tc.machineType, func(t *testing.T) {
Expand Down
Loading

0 comments on commit 4c39761

Please sign in to comment.