File tree Expand file tree Collapse file tree 4 files changed +23
-6
lines changed
enterprise/reporting/event_sampler Expand file tree Collapse file tree 4 files changed +23
-6
lines changed Original file line number Diff line number Diff line change 7777 - name : golangci-lint
7878 uses : golangci/golangci-lint-action@v7
7979 with :
80- version : v2.0.0
80+ version : v2.0.2
8181 args : -v
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ TESTFILE=_testok
66MOUNT_PATH =/local
77
88# go tools versions
9- GOLANGCI =github.com/golangci/golangci-lint/cmd/golangci-lint@2 .0.1
9+ GOLANGCI =github.com/golangci/golangci-lint/v2/ cmd/golangci-lint@v2 .0.2
1010gofumpt =mvdan.cc/gofumpt@latest
1111govulncheck =golang.org/x/vuln/cmd/govulncheck@latest
1212goimports =golang.org/x/tools/cmd/goimports@latest
Original file line number Diff line number Diff line change @@ -84,7 +84,16 @@ func NewBadgerEventSampler(
8484 return nil , fmt .Errorf ("removing badger db directory: %w" , err )
8585 }
8686 }
87- db , err := badger .Open (opts )
87+
88+ openDB := func () (dbase * badger.DB , err error ) {
89+ defer func () {
90+ if r := recover (); r != nil {
91+ err = fmt .Errorf ("panic during badgerdb open: %v" , r )
92+ }
93+ }()
94+ return badger .Open (opts )
95+ }
96+ db , err := openDB ()
8897 if err != nil {
8998 // corrupted or incompatible db, clean up the directory and retry
9099 log .Errorn ("Error while opening event sampler badger db, cleaning up the directory" ,
@@ -94,7 +103,7 @@ func NewBadgerEventSampler(
94103 if err := os .RemoveAll (opts .Dir ); err != nil {
95104 return nil , fmt .Errorf ("removing badger db directory: %w" , err )
96105 }
97- if db , err = badger . Open ( opts ); err != nil {
106+ if db , err = openDB ( ); err != nil {
98107 return nil , fmt .Errorf ("opening badger db: %w" , err )
99108 }
100109 }
Original file line number Diff line number Diff line change @@ -148,7 +148,15 @@ func (d *BadgerDB) init() error {
148148 return
149149 }
150150 }
151- d .badgerDB , err = badger .Open (d .opts )
151+ openDB := func () (dbase * badger.DB , err error ) {
152+ defer func () {
153+ if r := recover (); r != nil {
154+ err = fmt .Errorf ("panic during badgerdb open: %v" , r )
155+ }
156+ }()
157+ return badger .Open (d .opts )
158+ }
159+ d .badgerDB , err = openDB ()
152160 if err != nil {
153161 // corrupted or incompatible db, clean up the directory and retry
154162 d .logger .Errorn ("Error while opening dedup badger db, cleaning up the directory" ,
@@ -158,7 +166,7 @@ func (d *BadgerDB) init() error {
158166 err = fmt .Errorf ("removing badger db directory: %w" , err )
159167 return
160168 }
161- d .badgerDB , err = badger . Open ( d . opts )
169+ d .badgerDB , err = openDB ( )
162170 if err != nil {
163171 err = fmt .Errorf ("opening badger db: %w" , err )
164172 return
You can’t perform that action at this time.
0 commit comments