Skip to content

Commit 7abb004

Browse files
committed
db: don't reuse options in TestCompactionPickerScores
1 parent 505e4d3 commit 7abb004

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

compaction_picker_test.go

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1463,20 +1463,8 @@ func TestCompactionPickerScores(t *testing.T) {
14631463
fs := vfs.NewMem()
14641464
cleaner := pausableCleaner{cleaner: DeleteCleaner{}}
14651465
cleaner.cond.L = &cleaner.mu
1466-
opts := &Options{
1467-
Cleaner: &cleaner,
1468-
Comparer: testkeys.Comparer,
1469-
DisableAutomaticCompactions: true,
1470-
FormatMajorVersion: FormatNewest,
1471-
FS: fs,
1472-
Logger: testutils.Logger{T: t},
1473-
}
1474-
opts.Experimental.CompactionScheduler = func() CompactionScheduler {
1475-
return NewConcurrencyLimitSchedulerWithNoPeriodicGrantingForTest()
1476-
}
14771466

1478-
d, err := Open("", opts)
1479-
require.NoError(t, err)
1467+
var d *DB
14801468
defer func() {
14811469
if d != nil {
14821470
cleaner.resume()
@@ -1500,15 +1488,26 @@ func TestCompactionPickerScores(t *testing.T) {
15001488
return ""
15011489

15021490
case "define":
1503-
require.NoError(t, closeAllSnapshots(d))
1504-
require.NoError(t, d.Close())
1491+
if d != nil {
1492+
require.NoError(t, closeAllSnapshots(d))
1493+
require.NoError(t, d.Close())
1494+
}
15051495

15061496
if td.HasArg("pause-cleaning") {
15071497
cleaner.pause()
15081498
}
1499+
opts := &Options{
1500+
Cleaner: &cleaner,
1501+
Comparer: testkeys.Comparer,
1502+
DisableAutomaticCompactions: true,
1503+
FormatMajorVersion: FormatNewest,
1504+
FS: fs,
1505+
Logger: testutils.Logger{T: t},
1506+
}
15091507
opts.Experimental.CompactionScheduler = func() CompactionScheduler {
15101508
return NewConcurrencyLimitSchedulerWithNoPeriodicGrantingForTest()
15111509
}
1510+
var err error
15121511
d, err = runDBDefineCmd(td, opts)
15131512
if err != nil {
15141513
return err.Error()
@@ -1542,10 +1541,10 @@ func TestCompactionPickerScores(t *testing.T) {
15421541
return ""
15431542

15441543
case "ingest":
1545-
if err = runBuildCmd(td, d, d.opts.FS); err != nil {
1544+
if err := runBuildCmd(td, d, d.opts.FS); err != nil {
15461545
return err.Error()
15471546
}
1548-
if err = runIngestCmd(td, d, d.opts.FS); err != nil {
1547+
if err := runIngestCmd(td, d, d.opts.FS); err != nil {
15491548
return err.Error()
15501549
}
15511550
d.mu.Lock()

0 commit comments

Comments
 (0)