From aca738fbc656ae29137c06999eea628c020f7c2f Mon Sep 17 00:00:00 2001 From: Robert Pirtle Date: Mon, 20 Nov 2023 15:27:16 -0800 Subject: [PATCH] fix(rocksdb): correctly resolve rocksdb path (#1767) (#1776) * fix(rocksdb): correctly resolve rocksdb path (#1767) ensure we use KAVA_HOME/data/application.db and not a nested application.db within that path * update changelog --------- Co-authored-by: Nick DeLuca --- CHANGELOG.md | 2 ++ cmd/kava/opendb/opendb_rocksdb.go | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96cb9d84..10ccb374 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ - (evmutil) [#1655] Initialize x/evmutil module account in InitGenesis - (deps) [#1770] Bump ledger-cosmos-go to v0.13.1 to resolve signing error with cosmos ledger app 2.34.12 +- (rockdb) [#1776] Fix resolution of rocksdb database path ## State Machine Breaking @@ -304,6 +305,7 @@ the [changelog](https://github.com/cosmos/cosmos-sdk/blob/v0.38.4/CHANGELOG.md). - [#257](https://github.com/Kava-Labs/kava/pulls/257) Include scripts to run large-scale simulations remotely using aws-batch +[#1776]: https://github.com/Kava-Labs/kava/pull/1776 [#1770]: https://github.com/Kava-Labs/kava/pull/1770 [#1755]: https://github.com/Kava-Labs/kava/pull/1755 [#1761]: https://github.com/Kava-Labs/kava/pull/1761 diff --git a/cmd/kava/opendb/opendb_rocksdb.go b/cmd/kava/opendb/opendb_rocksdb.go index 6bd35636..c445933e 100644 --- a/cmd/kava/opendb/opendb_rocksdb.go +++ b/cmd/kava/opendb/opendb_rocksdb.go @@ -81,7 +81,7 @@ const ( func OpenDB(appOpts types.AppOptions, home string, backendType dbm.BackendType) (dbm.DB, error) { dataDir := filepath.Join(home, "data") if backendType == dbm.RocksDBBackend { - return openRocksdb(filepath.Join(dataDir, "application.db"), appOpts) + return openRocksdb(dataDir, appOpts) } return dbm.NewDB("application", backendType, dataDir) @@ -90,7 +90,8 @@ func OpenDB(appOpts types.AppOptions, home string, backendType dbm.BackendType) // openRocksdb loads existing options, overrides some of them with appOpts and opens database // option will be overridden only in case if it explicitly specified in appOpts func openRocksdb(dir string, appOpts types.AppOptions) (dbm.DB, error) { - dbOpts, cfOpts, err := loadLatestOptions(dir) + optionsPath := filepath.Join(dir, "application.db") + dbOpts, cfOpts, err := loadLatestOptions(optionsPath) if err != nil { return nil, err }