Skip to content

Commit 7ed7a10

Browse files
committed
chore: badger nop logger
1 parent 993eb45 commit 7ed7a10

File tree

2 files changed

+36
-30
lines changed

2 files changed

+36
-30
lines changed

internal/cache/badger/badger.go

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package badger
33
import (
44
"bufio"
55
"bytes"
6-
"compress/gzip"
76
"context"
87
"encoding/binary"
98
"errors"
@@ -24,7 +23,6 @@ import (
2423
"github.com/rudderlabs/rudder-go-kit/config"
2524
"github.com/rudderlabs/rudder-go-kit/logger"
2625
kitsync "github.com/rudderlabs/rudder-go-kit/sync"
27-
obskit "github.com/rudderlabs/rudder-observability-kit/go/labels"
2826
)
2927

3028
var ErrSnapshotInProgress = errors.New("snapshotting already in progress")
@@ -76,8 +74,13 @@ func New(h hasher, conf *config.Config, log logger.Logger) (*Cache, error) {
7674
WithValueThreshold(conf.GetInt64Var(10*bytesize.B, 1, "BadgerDB.Dedup.valueThreshold", "BadgerDB.valueThreshold")).
7775
WithSyncWrites(conf.GetBoolVar(false, "BadgerDB.Dedup.syncWrites", "BadgerDB.syncWrites")).
7876
WithBlockCacheSize(conf.GetInt64Var(0, 1, "BadgerDB.Dedup.blockCacheSize", "BadgerDB.blockCacheSize")).
79-
WithDetectConflicts(conf.GetBoolVar(false, "BadgerDB.Dedup.detectConflicts", "BadgerDB.detectConflicts")).
80-
WithLogger(loggerForBadger{log})
77+
WithDetectConflicts(conf.GetBoolVar(false, "BadgerDB.Dedup.detectConflicts", "BadgerDB.detectConflicts"))
78+
79+
if conf.GetBool("BadgerDB.Dedup.NopLogger", false) {
80+
opts = opts.WithLogger(loggerForBadger{logger.NOP})
81+
} else {
82+
opts = opts.WithLogger(loggerForBadger{log})
83+
}
8184

8285
compress := conf.GetBool("BadgerDB.Dedup.Compress", true)
8386
if compress {
@@ -176,17 +179,18 @@ func (c *Cache) CreateSnapshots(ctx context.Context, w map[uint32]io.Writer) (ui
176179

177180
// TODO gzip should be configurable, maybe we want to use another algorithm with a different compression level
178181
if c.compress {
179-
for hashRange, writer := range w {
180-
w[hashRange] = gzip.NewWriter(writer)
181-
}
182-
defer func() {
183-
for _, writer := range w {
184-
err := writer.(*gzip.Writer).Close()
185-
if err != nil {
186-
c.logger.Errorn("failed to close gzip writer", obskit.Error(err))
187-
}
188-
}
189-
}()
182+
// TODO implement but check other algos as well, possibly zstd
183+
//for hashRange, writer := range w {
184+
// w[hashRange] = gzip.NewWriter(writer)
185+
//}
186+
//defer func() {
187+
// for _, writer := range w {
188+
// err := writer.(*gzip.Writer).Close()
189+
// if err != nil {
190+
// c.logger.Errorn("failed to close gzip writer", obskit.Error(err))
191+
// }
192+
// }
193+
//}()
190194
}
191195

192196
hashRangesMap := make(map[uint32]struct{})
@@ -319,21 +323,22 @@ func (c *Cache) CreateSnapshots(ctx context.Context, w map[uint32]io.Writer) (ui
319323
func (c *Cache) LoadSnapshots(ctx context.Context, r ...io.Reader) error {
320324
// TODO gzip should be configurable, maybe we want to use another algorithm with a different compression level
321325
if c.compress {
322-
var err error
323-
for i, rdr := range r {
324-
r[i], err = gzip.NewReader(rdr)
325-
if err != nil {
326-
return fmt.Errorf("failed to create gzip reader: %w", err)
327-
}
328-
}
329-
defer func() {
330-
for _, rdr := range r {
331-
err := rdr.(*gzip.Reader).Close()
332-
if err != nil {
333-
c.logger.Errorn("failed to close gzip reader", obskit.Error(err))
334-
}
335-
}
336-
}()
326+
// TODO implement but check other algos as well, possibly zstd
327+
//var err error
328+
//for i, rdr := range r {
329+
// r[i], err = gzip.NewReader(rdr)
330+
// if err != nil {
331+
// return fmt.Errorf("failed to create gzip reader: %w", err)
332+
// }
333+
//}
334+
//defer func() {
335+
// for _, rdr := range r {
336+
// err := rdr.(*gzip.Reader).Close()
337+
// if err != nil {
338+
// c.logger.Errorn("failed to close gzip reader", obskit.Error(err))
339+
// }
340+
// }
341+
//}()
337342
}
338343

339344
// Create KVLoader for batch writing entries

node/node_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ func getService(
336336
if testing.Verbose() {
337337
log = logger.NewLogger()
338338
}
339+
conf.Set("BadgerDB.Dedup.NopLogger", true)
339340
service, err := NewService(ctx, nodeConfig, cs, conf, stats.NOP, log)
340341
require.NoError(t, err)
341342

0 commit comments

Comments
 (0)