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

fix: extend LOTUS_CHAIN_BADGERSTORE_DISABLE_FSYNC to the markset

Browse Source 
Without doing this walking a badger markset on a non-nvme knocks the
node hopelessly out of sync during a compaction.
This commit is contained in:
Peter Rabbitson 2023-02-01 20:04:58 +01:00
parent b8e7262b14
commit 818b3b8daf
3 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blockstore/splitstore/markset_badger.go
View File

@ -11,6 +11,8 @@ import (
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
"go.uber.org/zap" "go.uber.org/zap"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/lotus/system"
) )
type BadgerMarkSetEnv struct { type BadgerMarkSetEnv struct {
@ -349,7 +351,7 @@ func (s *BadgerMarkSet) write(seqno int) (err error) {
persist := s.persist persist := s.persist
s.mx.RUnlock() s.mx.RUnlock()
if persist { if persist && !system.BadgerFsyncDisable {
return s.db.Sync() return s.db.Sync()
} }

16
node/repo/fsrepo.go
View File

@ -27,6 +27,7 @@ import (
"github.com/filecoin-project/lotus/node/config" "github.com/filecoin-project/lotus/node/config"
"github.com/filecoin-project/lotus/storage/sealer/fsutil" "github.com/filecoin-project/lotus/storage/sealer/fsutil"
"github.com/filecoin-project/lotus/storage/sealer/storiface" "github.com/filecoin-project/lotus/storage/sealer/storiface"
"github.com/filecoin-project/lotus/system"
) )
const ( const (
@ -479,19 +480,8 @@ func (fsr *fsLockedRepo) Blockstore(ctx context.Context, domain BlockstoreDomain
return return
} }
// if system.BadgerFsyncDisable {
// Tri-state environment variable LOTUS_CHAIN_BADGERSTORE_DISABLE_FSYNC opts.SyncWrites = false
// - unset == the default (currently fsync enabled)
// - set with a false-y value == fsync enabled no matter what a future default is
// - set with any other value == fsync is disabled ignored defaults (recommended for day-to-day use)
//
if nosyncBs, nosyncBsSet := os.LookupEnv("LOTUS_CHAIN_BADGERSTORE_DISABLE_FSYNC"); nosyncBsSet {
nosyncBs = strings.ToLower(nosyncBs)
if nosyncBs == "" || nosyncBs == "0" || nosyncBs == "false" || nosyncBs == "no" {
opts.SyncWrites = true
} else {
opts.SyncWrites = false
}
} }
bs, err := badgerbs.Open(opts) bs, err := badgerbs.Open(opts)

25
system/io.go Normal file
View File

@ -0,0 +1,25 @@
package system
import (
"os"
"strings"
)
var BadgerFsyncDisable bool
func init() {
//
// Tri-state environment variable LOTUS_CHAIN_BADGERSTORE_DISABLE_FSYNC
// - unset == the default (currently fsync enabled)
// - set with a false-y value == fsync enabled no matter what a future default is
// - set with any other value == fsync is disabled ignored defaults (recommended for day-to-day use)
//
if nosyncBs, nosyncBsSet := os.LookupEnv("LOTUS_CHAIN_BADGERSTORE_DISABLE_FSYNC"); nosyncBsSet {
nosyncBs = strings.ToLower(nosyncBs)
if nosyncBs == "" || nosyncBs == "0" || nosyncBs == "false" || nosyncBs == "no" {
BadgerFsyncDisable = false
} else {
BadgerFsyncDisable = true
}
}
}