Problem: memiavl restore fail to reopen the db

CHANGELOG.md

@@ -35,6 +35,7 @@
 - [#1102](https://github.com/crypto-org-chain/cronos/pull/1102) avoid duplicate cache events emitted from ibc and gravity hook.
 - [#1123](https://github.com/crypto-org-chain/cronos/pull/1123) Fix memiavl snapshot switching
 - [#1125](https://github.com/crypto-org-chain/cronos/pull/1125) Fix genesis migrate for feeibc, evm, feemarket and gravity.
+- [#1130](https://github.com/crypto-org-chain/cronos/pull/1130) Fix lock issues when state-sync with memiavl.
 
 ### Features
 

integration_tests/test_basic.py

@@ -197,7 +197,12 @@ def test_statesync(cronos):
             "json-rpc": {
                 "address": "127.0.0.1:{EVMRPC_PORT}",
                 "ws-address": "127.0.0.1:{EVMRPC_PORT_WS}",
-            }
+            },
+            "memiavl": {
+                "enable": True,
+                "zero-copy": True,
+                "snapshot-interval": 5,
+            },
         },
     )
     clustercli.supervisor.startProcess(f"{clustercli.chain_id}-node{i}")

memiavl/import.go

@@ -27,6 +27,12 @@
 	snapshotDir := snapshotName(int64(height))
 	tmpDir := snapshotDir + "-tmp"
 
+	fileLock, err := LockFile(filepath.Join(dir, LockFileName))
+	if err != nil {
+		return snapshottypes.SnapshotItem{}, fmt.Errorf("fail to lock db: %w", err)
+	}
+	defer fileLock.Unlock()
+
 	// Import nodes into stores. The first item is expected to be a SnapshotItem containing
 	// a SnapshotStoreItem, telling us which store to import into. The following items will contain
 	// SnapshotNodeItem (i.e. ExportNode) until we reach the next SnapshotStoreItem or EOF.

store/rootmulti/store.go

@@ -231,6 +231,13 @@ func (rs *Store) Snapshot(height uint64, protoWriter protoio.Writer) error {
 
 // Implements interface Snapshotter
 func (rs *Store) Restore(height uint64, format uint32, protoReader protoio.Reader) (snapshottypes.SnapshotItem, error) {
+	if rs.db != nil {
+		if err := rs.db.Close(); err != nil {
+			return snapshottypes.SnapshotItem{}, fmt.Errorf("failed to close db: %w", err)
+		}
+		rs.db = nil
+	}
+
 	item, err := memiavl.Import(rs.dir, height, format, protoReader)
 	if err != nil {
 		return item, err