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.

Sign up for GitHub

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

Problem: versiondb lag behind when os reboot #1304

Merged
merged 4 commits into from
Jan 29, 2024
Merged

Problem: versiondb lag behind when os reboot #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8256c05
Problem: versiondb lag behind when os reboot
yihuang Jan 26, 2024
772b8aa
Update CHANGELOG.md
yihuang Jan 26, 2024
8b40a2c
relax version checking
yihuang Jan 26, 2024
052ef9d
changelog
yihuang Jan 26, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- [#1292](https://github.com/crypto-org-chain/cronos/pull/1292) memiavl cancel background snapshot rewriting when graceful shutdown.
- [#1294](https://github.com/crypto-org-chain/cronos/pull/1294) Update ethermint to fix and improve of debug_traceCall and eth_feeHistory.
- [#1302](https://github.com/crypto-org-chain/cronos/pull/1302) Fix concurrent map access in rootmulti store.
- [#1304](https://github.com/crypto-org-chain/cronos/pull/1304) Write versiondb with fsync, and relax the version requirement on startup.

*January 5, 2024*

Expand Down
5 changes: 3 additions & 2 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,8 +900,9 @@ func New(
if qms != nil {
v1 := qms.LatestVersion()
v2 := app.LastBlockHeight()
if v1 > 0 && v1 != v2 {
tmos.Exit(fmt.Sprintf("versiondb lastest version %d don't match iavl latest version %d", v1, v2))
if v1 > 0 && v1 < v2 {
// try to prevent gap being created in versiondb
tmos.Exit(fmt.Sprintf("versiondb version %d lag behind iavl version %d", v1, v2))
mmsqe marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Expand Down
11 changes: 8 additions & 3 deletions versiondb/tsrocksdb/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,15 @@ var (

_ versiondb.VersionStore = Store{}

defaultWriteOpts = grocksdb.NewDefaultWriteOptions()
defaultReadOpts = grocksdb.NewDefaultReadOptions()
defaultWriteOpts = grocksdb.NewDefaultWriteOptions()
defaultSyncWriteOpts = grocksdb.NewDefaultWriteOptions()
defaultReadOpts = grocksdb.NewDefaultReadOptions()
)

func init() {
defaultSyncWriteOpts.SetSync(true)
yihuang marked this conversation as resolved.
Show resolved Hide resolved
}

type Store struct {
db *grocksdb.DB
cfHandle *grocksdb.ColumnFamilyHandle
Expand Down Expand Up @@ -77,7 +82,7 @@ func (s Store) PutAtVersion(version int64, changeSet []types.StoreKVPair) error
}
}

return s.db.Write(defaultWriteOpts, batch)
return s.db.Write(defaultSyncWriteOpts, batch)
mmsqe marked this conversation as resolved.
Show resolved Hide resolved
}

func (s Store) GetAtVersionSlice(storeKey string, key []byte, version *int64) (*grocksdb.Slice, error) {
Expand Down
Loading