Skip to content

Commit 9a70b62

Browse files
committed
storage: remove unnecessary initialization in newPebble
We now only call this function from Open and we always have options set. Epic: none Release note: None
1 parent 6fa2ffd commit 9a70b62

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

pkg/storage/pebble.go

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -666,17 +666,11 @@ var ConfigureForSharedStorage func(opts *pebble.Options, storage remote.Storage)
666666
// Direct users of NewPebble: cfs.opts.{Logger,LoggerAndTracer} must not be
667667
// set.
668668
func newPebble(ctx context.Context, cfg engineConfig) (p *Pebble, err error) {
669-
if cfg.opts == nil {
670-
cfg.opts = DefaultPebbleOptions()
671-
} else {
672-
// Open also causes DefaultPebbleOptions before calling NewPebble, so we
673-
// are tolerant of Logger being set to pebble.DefaultLogger.
674-
if cfg.opts.Logger != nil && cfg.opts.Logger != pebble.DefaultLogger {
675-
return nil, errors.AssertionFailedf("Options.Logger is set to unexpected value")
676-
}
677-
// Clone the given options so that we are free to modify them.
678-
cfg.opts = cfg.opts.Clone()
669+
if cfg.opts.Logger != nil {
670+
return nil, errors.AssertionFailedf("Options.Logger is set to unexpected value")
679671
}
672+
// Clone the given options so that we are free to modify them.
673+
cfg.opts = cfg.opts.Clone()
680674
if cfg.opts.FormatMajorVersion < MinimumSupportedFormatVersion {
681675
return nil, errors.AssertionFailedf(
682676
"FormatMajorVersion is %d, should be at least %d",

0 commit comments

Comments
 (0)