Skip to content

Problem: concurrent map access in multistore #414

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Problem: concurrent map access in multistore #414

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7666628
Problem: concurrent map access in multistore
mmsqe Jan 30, 2024
eedac2d
avoid deadlock
mmsqe Jan 31, 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
34 changes: 21 additions & 13 deletions storev2/rootmulti/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,31 +93,33 @@ func (rs *Store) Commit(bumpVersion bool) types.CommitID {
if !bumpVersion {
return rs.lastCommitInfo.CommitID()
}
rs.mtx.RLock()
if err := rs.flush(); err != nil {
panic(err)
}

rs.mtx.Lock()
defer rs.mtx.Unlock()
for _, store := range rs.ckvStores {
iavlStoreKeys := make([]types.StoreKey, 0)
for key, store := range rs.ckvStores {
if store.GetStoreType() != types.StoreTypeIAVL {
_ = store.Commit(bumpVersion)
} else {
iavlStoreKeys = append(iavlStoreKeys, key)
}
}
rs.mtx.RUnlock()
// Commit to SC Store
_, err := rs.scStore.Commit()
if err != nil {
panic(err)
}

// The underlying sc store might be reloaded, reload the store as well.
for key := range rs.ckvStores {
store := rs.ckvStores[key]
if store.GetStoreType() == types.StoreTypeIAVL {
rs.ckvStores[key], err = rs.loadCommitStoreFromParams(key, rs.storesParams[key])
if err != nil {
panic(fmt.Errorf("inconsistent store map, store %s not found", key.Name()))
}
for _, key := range iavlStoreKeys {
rs.mtx.Lock()
rs.ckvStores[key], err = rs.loadCommitStoreFromParams(key, rs.storesParams[key])
rs.mtx.Unlock()
if err != nil {
panic(fmt.Errorf("inconsistent store map, store %s not found", key.Name()))
}
}

Expand All @@ -142,9 +144,8 @@ func (rs *Store) StateStoreCommit() {
func (rs *Store) flush() error {
var changeSets []*proto.NamedChangeSet
currentVersion := rs.lastCommitInfo.Version
for key := range rs.ckvStores {
for key, store := range rs.ckvStores {
// it'll unwrap the inter-block cache
store := rs.GetCommitKVStore(key)
if commitStore, ok := store.(*commitment.Store); ok {
cs := commitStore.PopChangeSet()
if len(cs.Pairs) > 0 {
Expand Down Expand Up @@ -262,11 +263,15 @@ func (rs *Store) CacheMultiStoreWithVersion(version int64) (types.CacheMultiStor

// GetStore Implements interface MultiStore
func (rs *Store) GetStore(key types.StoreKey) types.Store {
rs.mtx.RLock()
defer rs.mtx.RUnlock()
return rs.ckvStores[key]
}

// GetKVStore Implements interface MultiStore
func (rs *Store) GetKVStore(key types.StoreKey) types.KVStore {
rs.mtx.RLock()
defer rs.mtx.RUnlock()
return rs.ckvStores[key]
}

Expand Down Expand Up @@ -317,6 +322,8 @@ func (rs *Store) GetCommitStore(key types.StoreKey) types.CommitStore {

// GetCommitKVStore Implements interface CommitMultiStore
func (rs *Store) GetCommitKVStore(key types.StoreKey) types.CommitKVStore {
rs.mtx.RLock()
defer rs.mtx.RUnlock()
return rs.ckvStores[key]
}

Expand Down Expand Up @@ -380,7 +387,6 @@ func (rs *Store) LoadVersionAndUpgrade(version int64, upgrades *types.StoreUpgra
return err
}
}

rs.mtx.Lock()
defer rs.mtx.Unlock()
rs.ckvStores = newStores
Expand Down Expand Up @@ -599,6 +605,8 @@ func convertCommitInfo(commitInfo *proto.CommitInfo) *types.CommitInfo {

// GetWorkingHash returns the working app hash
func (rs *Store) GetWorkingHash() ([]byte, error) {
rs.mtx.RLock()
defer rs.mtx.RUnlock()
if err := rs.flush(); err != nil {
return nil, err
}
Expand Down