Merge cockroachdb#34787

34787: roachtest: fix cdc/*/rangefeed=false r=nvanbenschoten,tbg a=danhhz The `changefeed.push.enabled` setting doesn't exist on release-2.1, so don't try setting it. Closes cockroachdb#34698 Closes cockroachdb#34699 Closes cockroachdb#34697 Closes cockroachdb#34696 Closes cockroachdb#34389 Release note: None Co-authored-by: Daniel Harrison <[email protected]>
ajwerner · Feb 11, 2019 · 235c81c · 235c81c
2 parents ac51198 + 051fb45
commit 235c81c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/pkg/cmd/roachtest/cdc.go b/pkg/cmd/roachtest/cdc.go
@@ -71,10 +71,12 @@ func cdcBasicTest(ctx context.Context, t *test, c *cluster, args cdcTestArgs) {
 	); err != nil {
 		t.Fatal(err)
 	}
-	if _, err := db.Exec(
-		`SET CLUSTER SETTING changefeed.push.enabled = $1`, args.rangefeed,
-	); err != nil {
-		t.Fatal(err)
+	if args.rangefeed {
+		if _, err := db.Exec(
+			`SET CLUSTER SETTING changefeed.push.enabled = $1`, args.rangefeed,
+		); err != nil {
+			t.Fatal(err)
+		}
 	}
 	kafka := kafkaManager{
 		c:     c,