Skip to content

Commit a713b59

Browse files
committed
roachtest: remove reader workload from c2c/mixed-version
This is a temporary work around until #155658 is backported to the minor versions that are used by the mixed version test framework. Release note: none Release justification: test only change Fixes: #154125
1 parent 0c6f471 commit a713b59

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

pkg/cmd/roachtest/tests/mixed_version_c2c.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -280,16 +280,17 @@ func (cm *c2cMixed) WorkloadHook(ctx context.Context) {
280280
Flag("warehouses", 500)
281281
cm.workloadStopper = cm.sourceMvt.Workload("tpcc", cm.c.WorkloadNode(), tpccInitCmd, tpccRunCmd)
282282

283-
readerTenantName := fmt.Sprintf("%s-readonly", destTenantName)
284-
285-
tpccStandbyRunCmd := roachtestutil.NewCommand("./cockroach workload run tpcc").
286-
Arg("{pgurl%s:%s}", cm.c.Range(cm.sp.srcNodes+1, cm.sp.srcNodes+cm.sp.dstNodes), readerTenantName).
287-
Option("tolerate-errors").
288-
Flag("warehouses", 500).
289-
Flag("mix", "newOrder=0,payment=0,orderStatus=1,delivery=0,stockLevel=1")
290-
291-
cm.readOnlyWorkloadStopper = cm.destMvt.Workload("tpcc-read-only", cm.c.WorkloadNode(), nil, tpccStandbyRunCmd)
292-
283+
// TODO(jeffswenson): re-enable this once we can configure the pgwire retry limit.
284+
// readerTenantName := fmt.Sprintf("%s-readonly", destTenantName)
285+
//
286+
// tpccStandbyRunCmd := roachtestutil.NewCommand("./cockroach workload run tpcc").
287+
// Arg("{pgurl%s:%s}", cm.c.Range(cm.sp.srcNodes+1, cm.sp.srcNodes+cm.sp.dstNodes), readerTenantName).
288+
// Option("tolerate-errors").
289+
// Flag("warehouses", 500).
290+
// Flag("mix", "newOrder=0,payment=0,orderStatus=1,delivery=0,stockLevel=1")
291+
//
292+
// cm.readOnlyWorkloadStopper = cm.destMvt.Workload("tpcc-read-only", cm.c.WorkloadNode(), nil, tpccStandbyRunCmd)
293+
cm.readOnlyWorkloadStopper = func() {}
293294
}
294295

295296
func (cm *c2cMixed) LatencyHook(ctx context.Context) {

0 commit comments

Comments
 (0)