Skip to content

Commit 4c39761

Browse files
craig[bot]samiskinnvbrafiss
committed
108111: changefeedccl: enable changefeed tests on ARM r=samiskin a=samiskin Resolves cockroachdb#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 cockroachdb#108322 backport fixes cockroachdb#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]>
4 parents 10fac80 + a6ac637 + 5aef86c + fe28c37 commit 4c39761

File tree

6 files changed

+222
-190
lines changed

6 files changed

+222
-190
lines changed

pkg/bench/rttanalysis/testdata/benchmark_expectations

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ exp,benchmark
4141
17,DropDatabase/drop_database_3_tables
4242
26,DropRole/drop_1_role
4343
36,DropRole/drop_2_roles
44-
45,DropRole/drop_3_roles
44+
42-45,DropRole/drop_3_roles
4545
15,DropSequence/drop_1_sequence
4646
17,DropSequence/drop_2_sequences
4747
19,DropSequence/drop_3_sequences

pkg/cmd/roachtest/cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ func MachineTypeToCPUs(s string) int {
740740
if _, err := fmt.Sscanf(s, "n2-standard-%d", &v); err == nil {
741741
return v
742742
}
743-
if _, err := fmt.Sscanf(s, "n2-standard-%d", &v); err == nil {
743+
if _, err := fmt.Sscanf(s, "t2a-standard-%d", &v); err == nil {
744744
return v
745745
}
746746
if _, err := fmt.Sscanf(s, "n2-highcpu-%d", &v); err == nil {

pkg/cmd/roachtest/cluster_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,12 @@ func TestClusterMachineType(t *testing.T) {
168168
{"n2-standard-32", 32},
169169
{"n2-standard-64", 64},
170170
{"n2-standard-96", 96},
171+
{"t2a-standard-2", 2},
172+
{"t2a-standard-4", 4},
173+
{"t2a-standard-8", 8},
174+
{"t2a-standard-16", 16},
175+
{"t2a-standard-32", 32},
176+
{"t2a-standard-48", 48},
171177
}
172178
for _, tc := range testCases {
173179
t.Run(tc.machineType, func(t *testing.T) {

0 commit comments

Comments
 (0)