Skip to content

Commit 51bed48

Browse files
author
marc
committed
roachtest: disable encryption on tests that can't handle it.
Two cases make encryption always fail: - old versions (<= 2.0) - uses of debug commands that open the rocksdb instance (needs encryption flags) Release note: None
1 parent bfdc5ee commit 51bed48

File tree

4 files changed

+22
-11
lines changed

4 files changed

+22
-11
lines changed

pkg/cmd/roachtest/cdc.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ func registerCDC(r *registry) {
3333

3434
c.Put(ctx, cockroach, "./cockroach", crdbNodes)
3535
c.Put(ctx, workload, "./workload", workloadNode)
36-
c.Start(ctx, crdbNodes)
36+
// Force encryption off as we do not have a good way to detect whether it is enabled
37+
// for the `debug compact` call below.
38+
c.Start(ctx, crdbNodes, startArgsDontEncrypt)
3739

3840
t.Status("loading initial data")
3941
c.Run(ctx, workloadNode, fmt.Sprintf(
@@ -44,7 +46,7 @@ func registerCDC(r *registry) {
4446
// fixed. See #26870
4547
c.Stop(ctx, crdbNodes)
4648
c.Run(ctx, crdbNodes, `./cockroach debug compact /mnt/data1/cockroach/`)
47-
c.Start(ctx, crdbNodes)
49+
c.Start(ctx, crdbNodes, startArgsDontEncrypt)
4850

4951
t.Status("installing kafka")
5052
c.Run(ctx, kafkaNode, `curl https://packages.confluent.io/archive/4.0/confluent-oss-4.0.0-2.11.tar.gz | tar -xzv`)

pkg/cmd/roachtest/cluster.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,11 @@ func startArgs(extraArgs ...string) option {
699699
return roachprodArgOption(extraArgs)
700700
}
701701

702+
// startArgsDontEncrypt will pass '--encrypt=false' to roachprod regardless of the
703+
// --encrypt flag on roachtest. This is useful for tests that cannot pass with
704+
// encryption enabled.
705+
var startArgsDontEncrypt = startArgs("--encrypt=false")
706+
702707
// stopArgs specifies extra arguments that are passed to `roachprod` during `c.Stop`.
703708
func stopArgs(extraArgs ...string) option {
704709
return roachprodArgOption(extraArgs)

pkg/cmd/roachtest/upgrade.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ func registerUpgrade(r *registry) {
4343
}
4444

4545
c.Put(ctx, b, "./cockroach", c.Range(1, nodes))
46-
c.Start(ctx, c.Range(1, nodes))
46+
// Force disable encryption.
47+
// TODO(mberhault): allow it once oldVersion >= 2.1.
48+
c.Start(ctx, c.Range(1, nodes), startArgsDontEncrypt)
4749

4850
const stageDuration = 30 * time.Second
4951
const timeUntilStoreDead = 90 * time.Second
@@ -129,7 +131,7 @@ func registerUpgrade(r *registry) {
129131
t.Fatal(err)
130132
}
131133
c.Put(ctx, cockroach, "./cockroach", c.Node(i))
132-
c.Start(ctx, c.Node(i))
134+
c.Start(ctx, c.Node(i), startArgsDontEncrypt)
133135
if err := sleep(stageDuration); err != nil {
134136
t.Fatal(err)
135137
}
@@ -151,7 +153,7 @@ func registerUpgrade(r *registry) {
151153
t.Fatal(err)
152154
}
153155
c.Put(ctx, cockroach, "./cockroach", c.Node(nodes))
154-
c.Start(ctx, c.Node(nodes))
156+
c.Start(ctx, c.Node(nodes), startArgsDontEncrypt)
155157
if err := sleep(stageDuration); err != nil {
156158
t.Fatal(err)
157159
}
@@ -192,7 +194,7 @@ func registerUpgrade(r *registry) {
192194
}
193195

194196
// Restart the previously stopped node.
195-
c.Start(ctx, c.Node(nodes-1))
197+
c.Start(ctx, c.Node(nodes-1), startArgsDontEncrypt)
196198
if err := sleep(stageDuration); err != nil {
197199
t.Fatal(err)
198200
}

pkg/cmd/roachtest/version.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ func registerVersion(r *registry) {
4848
c.Put(ctx, workload, "./workload", c.Node(nodes+1))
4949

5050
c.Put(ctx, b, "./cockroach", c.Range(1, nodes))
51-
c.Start(ctx, c.Range(1, nodes))
51+
// Force disable encryption.
52+
// TODO(mberhault): allow it once version >= 2.1.
53+
c.Start(ctx, c.Range(1, nodes), startArgsDontEncrypt)
5254

5355
stageDuration := 10 * time.Minute
5456
buffer := 10 * time.Minute
@@ -167,7 +169,7 @@ func registerVersion(r *registry) {
167169
return err
168170
}
169171
c.Put(ctx, cockroach, "./cockroach", c.Node(i))
170-
c.Start(ctx, c.Node(i))
172+
c.Start(ctx, c.Node(i), startArgsDontEncrypt)
171173
if err := sleepAndCheck(); err != nil {
172174
return err
173175
}
@@ -188,7 +190,7 @@ func registerVersion(r *registry) {
188190

189191
// Do upgrade for the last node.
190192
c.Put(ctx, cockroach, "./cockroach", c.Node(nodes))
191-
c.Start(ctx, c.Node(nodes))
193+
c.Start(ctx, c.Node(nodes), startArgsDontEncrypt)
192194
if err := sleepAndCheck(); err != nil {
193195
return err
194196
}
@@ -200,7 +202,7 @@ func registerVersion(r *registry) {
200202
return err
201203
}
202204
c.Put(ctx, b, "./cockroach", c.Node(i))
203-
c.Start(ctx, c.Node(i))
205+
c.Start(ctx, c.Node(i), startArgsDontEncrypt)
204206
if err := sleepAndCheck(); err != nil {
205207
return err
206208
}
@@ -213,7 +215,7 @@ func registerVersion(r *registry) {
213215
return err
214216
}
215217
c.Put(ctx, cockroach, "./cockroach", c.Node(i))
216-
c.Start(ctx, c.Node(i))
218+
c.Start(ctx, c.Node(i), startArgsDontEncrypt)
217219
if err := sleepAndCheck(); err != nil {
218220
return err
219221
}

0 commit comments

Comments
 (0)