Skip to content

Commit 2d14106

Browse files
committed
Fix a crash
1 parent 56ab43c commit 2d14106

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

pkg/block/fetcher.go

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,19 @@ type RecursiveLister struct {
223223
}
224224

225225
func NewRecursiveLister(logger log.Logger, bkt objstore.InstrumentedBucketReader) *RecursiveLister {
226-
level.Info(logger).Log("msg", "Using recursive block lister")
226+
if logger != nil {
227+
level.Info(logger).Log("msg", "Using recursive block lister")
228+
}
227229
return &RecursiveLister{
228230
logger: logger,
229231
bkt: bkt,
230232
}
231233
}
232234

233235
func (f *RecursiveLister) GetActiveAndPartialBlockIDs(ctx context.Context, ch chan<- ulid.ULID) (partialBlocks map[ulid.ULID]bool, err error) {
234-
level.Info(f.logger).Log("msg", "recursive block lister started")
236+
if f.logger != nil {
237+
level.Info(f.logger).Log("msg", "recursive block lister started")
238+
}
235239
start := time.Now()
236240
partialBlocks = make(map[ulid.ULID]bool)
237241
err = f.bkt.Iter(ctx, "", func(name string) error {
@@ -256,7 +260,9 @@ func (f *RecursiveLister) GetActiveAndPartialBlockIDs(ctx context.Context, ch ch
256260
}
257261
return nil
258262
}, objstore.WithRecursiveIter())
259-
level.Info(f.logger).Log("msg", "recursive block lister ended", "duration", time.Since(start))
263+
if f.logger != nil {
264+
level.Info(f.logger).Log("msg", "recursive block lister ended", "duration", time.Since(start))
265+
}
260266
return partialBlocks, err
261267
}
262268

@@ -268,18 +274,18 @@ type ConcurrentLister struct {
268274
}
269275

270276
func NewConcurrentLister(logger log.Logger, bkt objstore.InstrumentedBucketReader) *ConcurrentLister {
271-
level.Info(logger).Log("msg", "Using concurrent block lister")
272277
return &ConcurrentLister{
273278
logger: logger,
274279
bkt: bkt,
275280
}
276281
}
277282

278283
func (f *ConcurrentLister) GetActiveAndPartialBlockIDs(ctx context.Context, ch chan<- ulid.ULID) (partialBlocks map[ulid.ULID]bool, err error) {
279-
level.Info(f.logger).Log("msg", "concurrent block lister started")
280284
start := time.Now()
281285
defer func() {
282-
level.Info(f.logger).Log("msg", "concurrent block lister end", "duration", time.Since(start))
286+
if f.logger != nil {
287+
level.Info(f.logger).Log("msg", "concurrent block lister end", "duration", time.Since(start))
288+
}
283289
}()
284290
const concurrency = 64
285291

@@ -529,7 +535,9 @@ func (f *BaseFetcher) fetchMetadata(ctx context.Context) (interface{}, error) {
529535
ch = make(chan ulid.ULID, f.concurrency)
530536
mtx sync.Mutex
531537
)
532-
level.Info(f.logger).Log("msg", "fetching meta data", "concurrency", f.concurrency, "cache_dir", f.cacheDir)
538+
if f.logger != nil {
539+
level.Info(f.logger).Log("msg", "fetching meta data", "concurrency", f.concurrency, "cache_dir", f.cacheDir)
540+
}
533541
for i := 0; i < f.concurrency; i++ {
534542
eg.Go(func() error {
535543
numBlocks := 0

0 commit comments

Comments
 (0)