Skip to content

Commit

Permalink
acceptanceccl: remove stale cockroachDiskSizeGB option
Browse files Browse the repository at this point in the history
This option has been dead since 9fc30f5 moved the data directory to
local SSD and the associated terraform variable. 8bec3b1 cleaned up most
references to [Cc]ockroachDiskSizeGB, but a few in acceptanceccl were
missed. Remove them.
  • Loading branch information
benesch committed Aug 21, 2017
1 parent 149783c commit d6132b3
Showing 1 changed file with 10 additions and 18 deletions.
28 changes: 10 additions & 18 deletions pkg/ccl/acceptanceccl/backup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ type benchmarkTest struct {
// prefix is the prefix that will be prepended to all resources created by
// Terraform.
prefix string
// cockroachDiskSizeGB is the size, in gigabytes, of the disks allocated
// for CockroachDB nodes. Leaving this as 0 accepts the default in the
// Terraform configs. This must be in GB, because Terraform only accepts
// disk size for GCE in GB.
cockroachDiskSizeGB int
// storeFixture is the name of the Azure Storage fixture to download and use
// as the store. Nothing is downloaded if storeFixture is empty.
storeFixture string
Expand Down Expand Up @@ -183,10 +178,9 @@ func BenchmarkRestoreBig(b *testing.B) {
restoreBaseURI := getAzureURI(b)

bt := benchmarkTest{
b: b,
nodes: 3,
cockroachDiskSizeGB: 250,
prefix: "restore",
b: b,
nodes: 3,
prefix: "restore",
}

defer bt.Close(ctx)
Expand Down Expand Up @@ -288,9 +282,8 @@ func BenchmarkRestore2TB(b *testing.B) {
// to change as little as possible while getting this working. Azure has
// large storage machines available, but has other issues we're working
// through (#15381).
nodes: 15,
cockroachDiskSizeGB: 250,
prefix: "restore2tb",
nodes: 15,
prefix: "restore2tb",
}

ctx := context.Background()
Expand Down Expand Up @@ -320,12 +313,11 @@ func BenchmarkBackup2TB(b *testing.B) {
backupBaseURI := getAzureURI(b)

bt := benchmarkTest{
b: b,
nodes: 10,
storeFixture: acceptance.FixtureURL(bulkArchiveStoreFixture),
cockroachDiskSizeGB: 250,
prefix: "backup2tb",
skipClusterInit: true,
b: b,
nodes: 10,
storeFixture: acceptance.FixtureURL(bulkArchiveStoreFixture),
prefix: "backup2tb",
skipClusterInit: true,
}

ctx := context.Background()
Expand Down

0 comments on commit d6132b3

Please sign in to comment.