Skip to content

roachtest: disable encryption on tests that can't handle it. #27087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
craig merged 1 commit into from
Jul 5, 2018
Merged

roachtest: disable encryption on tests that can't handle it. #27087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkg/cmd/roachtest/cdc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ func registerCDC(r *registry) {

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

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

t.Status("installing kafka")
c.Run(ctx, kafkaNode, `curl https://packages.confluent.io/archive/4.0/confluent-oss-4.0.0-2.11.tar.gz | tar -xzv`)
Expand Down
5 changes: 5 additions & 0 deletions pkg/cmd/roachtest/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,11 @@ func startArgs(extraArgs ...string) option {
return roachprodArgOption(extraArgs)
}

// startArgsDontEncrypt will pass '--encrypt=false' to roachprod regardless of the
// --encrypt flag on roachtest. This is useful for tests that cannot pass with
// encryption enabled.
var startArgsDontEncrypt = startArgs("--encrypt=false")

// stopArgs specifies extra arguments that are passed to `roachprod` during `c.Stop`.
func stopArgs(extraArgs ...string) option {
return roachprodArgOption(extraArgs)
Expand Down
10 changes: 6 additions & 4 deletions pkg/cmd/roachtest/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ func registerUpgrade(r *registry) {
}

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

const stageDuration = 30 * time.Second
const timeUntilStoreDead = 90 * time.Second
Expand Down Expand Up @@ -129,7 +131,7 @@ func registerUpgrade(r *registry) {
t.Fatal(err)
}
c.Put(ctx, cockroach, "./cockroach", c.Node(i))
c.Start(ctx, c.Node(i))
c.Start(ctx, c.Node(i), startArgsDontEncrypt)
if err := sleep(stageDuration); err != nil {
t.Fatal(err)
}
Expand All @@ -151,7 +153,7 @@ func registerUpgrade(r *registry) {
t.Fatal(err)
}
c.Put(ctx, cockroach, "./cockroach", c.Node(nodes))
c.Start(ctx, c.Node(nodes))
c.Start(ctx, c.Node(nodes), startArgsDontEncrypt)
if err := sleep(stageDuration); err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -192,7 +194,7 @@ func registerUpgrade(r *registry) {
}

// Restart the previously stopped node.
c.Start(ctx, c.Node(nodes-1))
c.Start(ctx, c.Node(nodes-1), startArgsDontEncrypt)
if err := sleep(stageDuration); err != nil {
t.Fatal(err)
}
Expand Down
12 changes: 7 additions & 5 deletions pkg/cmd/roachtest/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ func registerVersion(r *registry) {
c.Put(ctx, workload, "./workload", c.Node(nodes+1))

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

stageDuration := 10 * time.Minute
buffer := 10 * time.Minute
Expand Down Expand Up @@ -167,7 +169,7 @@ func registerVersion(r *registry) {
return err
}
c.Put(ctx, cockroach, "./cockroach", c.Node(i))
c.Start(ctx, c.Node(i))
c.Start(ctx, c.Node(i), startArgsDontEncrypt)
if err := sleepAndCheck(); err != nil {
return err
}
Expand All @@ -188,7 +190,7 @@ func registerVersion(r *registry) {

// Do upgrade for the last node.
c.Put(ctx, cockroach, "./cockroach", c.Node(nodes))
c.Start(ctx, c.Node(nodes))
c.Start(ctx, c.Node(nodes), startArgsDontEncrypt)
if err := sleepAndCheck(); err != nil {
return err
}
Expand All @@ -200,7 +202,7 @@ func registerVersion(r *registry) {
return err
}
c.Put(ctx, b, "./cockroach", c.Node(i))
c.Start(ctx, c.Node(i))
c.Start(ctx, c.Node(i), startArgsDontEncrypt)
if err := sleepAndCheck(); err != nil {
return err
}
Expand All @@ -213,7 +215,7 @@ func registerVersion(r *registry) {
return err
}
c.Put(ctx, cockroach, "./cockroach", c.Node(i))
c.Start(ctx, c.Node(i))
c.Start(ctx, c.Node(i), startArgsDontEncrypt)
if err := sleepAndCheck(); err != nil {
return err
}
Expand Down