Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use pebble nosync by default #3581

Merged
merged 6 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions database/pebbledb/batch.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ func (db *Database) NewBatch() database.Batch {

func (b *batch) Put(key, value []byte) error {
b.size += len(key) + len(value) + pebbleByteOverHead
return b.batch.Set(key, value, pebble.Sync)
return b.batch.Set(key, value, b.db.writeOptions)
}

func (b *batch) Delete(key []byte) error {
b.size += len(key) + pebbleByteOverHead
return b.batch.Delete(key, pebble.Sync)
return b.batch.Delete(key, b.db.writeOptions)
}

func (b *batch) Size() int {
Expand Down Expand Up @@ -67,7 +67,7 @@ func (b *batch) Write() error {
}

b.written = true
return updateError(b.batch.Commit(pebble.Sync))
return updateError(b.batch.Commit(b.db.writeOptions))
}

func (b *batch) Reset() {
Expand Down
2 changes: 1 addition & 1 deletion database/pebbledb/batch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestBatch(t *testing.T) {
require := require.New(t)
dirName := t.TempDir()

db, err := New(dirName, nil, logging.NoLog{}, prometheus.NewRegistry())
db, err := New(dirName, DefaultSyncWrites, nil, logging.NoLog{}, prometheus.NewRegistry())
require.NoError(err)

batchIntf := db.NewBatch()
Expand Down
11 changes: 8 additions & 3 deletions database/pebbledb/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ var (

errInvalidOperation = errors.New("invalid operation")

DefaultSyncWrites = true

DefaultConfig = Config{
CacheSize: defaultCacheSize,
BytesPerSync: 512 * units.KiB,
Expand All @@ -51,6 +53,7 @@ type Database struct {
pebbleDB *pebble.DB
closed bool
openIterators set.Set[*iter]
writeOptions *pebble.WriteOptions
}

type Config struct {
Expand All @@ -64,7 +67,7 @@ type Config struct {
}

// TODO: Add metrics
func New(file string, configBytes []byte, log logging.Logger, _ prometheus.Registerer) (database.Database, error) {
func New(file string, useSyncWrites bool, configBytes []byte, log logging.Logger, _ prometheus.Registerer) (database.Database, error) {
StephenButtolph marked this conversation as resolved.
Show resolved Hide resolved
cfg := DefaultConfig
if len(configBytes) > 0 {
if err := json.Unmarshal(configBytes, &cfg); err != nil {
Expand All @@ -86,13 +89,15 @@ func New(file string, configBytes []byte, log logging.Logger, _ prometheus.Regis

log.Info(
"opening pebble",
zap.Bool("useSyncWrites", useSyncWrites),
zap.Reflect("config", cfg),
)

db, err := pebble.Open(file, opts)
return &Database{
pebbleDB: db,
openIterators: set.Set[*iter]{},
writeOptions: &pebble.WriteOptions{Sync: useSyncWrites},
}, err
}

Expand Down Expand Up @@ -167,7 +172,7 @@ func (db *Database) Put(key []byte, value []byte) error {
return database.ErrClosed
}

return updateError(db.pebbleDB.Set(key, value, pebble.Sync))
return updateError(db.pebbleDB.Set(key, value, db.writeOptions))
}

func (db *Database) Delete(key []byte) error {
Expand All @@ -178,7 +183,7 @@ func (db *Database) Delete(key []byte) error {
return database.ErrClosed
}

return updateError(db.pebbleDB.Delete(key, pebble.Sync))
return updateError(db.pebbleDB.Delete(key, db.writeOptions))
}

func (db *Database) Compact(start []byte, end []byte) error {
Expand Down
2 changes: 1 addition & 1 deletion database/pebbledb/db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

func newDB(t testing.TB) *Database {
folder := t.TempDir()
db, err := New(folder, nil, logging.NoLog{}, prometheus.NewRegistry())
db, err := New(folder, DefaultSyncWrites, nil, logging.NoLog{}, prometheus.NewRegistry())
require.NoError(t, err)
return db.(*Database)
}
Expand Down
2 changes: 1 addition & 1 deletion node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ func (n *Node) initDatabase() error {
n.DB = memdb.New()
case pebbledb.Name:
dbPath := filepath.Join(n.Config.DatabaseConfig.Path, "pebble")
n.DB, err = pebbledb.New(dbPath, n.Config.DatabaseConfig.Config, n.Log, dbRegisterer)
n.DB, err = pebbledb.New(dbPath, pebbledb.DefaultSyncWrites, n.Config.DatabaseConfig.Config, n.Log, dbRegisterer)
if err != nil {
return fmt.Errorf("couldn't create %s at %s: %w", pebbledb.Name, dbPath, err)
}
Expand Down
Loading