cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

backupds kvlog: Address review

Browse Source
This commit is contained in:
Łukasz Magiera 2021-03-10 13:58:02 +01:00
parent 2b380c96a5
commit 3f1054daf4
2 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/backupds/datastore.go
View File

@ -6,6 +6,7 @@ import (
"sync" "sync"
"time" "time"
"go.uber.org/multierr"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore"
@ -189,11 +190,10 @@ func (d *Datastore) CloseLog() error {
} }
func (d *Datastore) Close() error { func (d *Datastore) Close() error {
if err := d.child.Close(); err != nil { return multierr.Combine(
return xerrors.Errorf("closing child datastore: %w", err) d.child.Close(),
} d.CloseLog(),
)
return d.CloseLog()
} }
func (d *Datastore) Batch() (datastore.Batch, error) { func (d *Datastore) Batch() (datastore.Batch, error) {

10
lib/backupds/log.go
View File

@ -65,7 +65,12 @@ func (d *Datastore) startLog(logdir string) error {
return xerrors.Errorf("writing new log head: %w", err) return xerrors.Errorf("writing new log head: %w", err)
} }
go func() { go d.runLog(l)
return nil
}
func (d *Datastore) runLog(l *logfile) {
defer close(d.closed) defer close(d.closed)
for { for {
select { select {
@ -86,9 +91,6 @@ func (d *Datastore) startLog(logdir string) error {
return return
} }
} }
}()
return nil
} }
type logfile struct { type logfile struct {