From 6aaa935019eb331af956acef9654393fe0f1aab7 Mon Sep 17 00:00:00 2001
From: lfz941 <linfanzai941@gmail.com>
Date: Tue, 17 Sep 2024 17:21:01 +0800
Subject: [PATCH] fix(store/v2): error info maybe covered by `err =
 batch.Close()` (#21727)

Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Marko <marko@baricevic.me>
---
 store/v2/commitment/metadata.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/store/v2/commitment/metadata.go b/store/v2/commitment/metadata.go
index 7462252e96..d7aea487c7 100644
--- a/store/v2/commitment/metadata.go
+++ b/store/v2/commitment/metadata.go
@@ -113,7 +113,10 @@ func (m *MetadataStore) flushCommitInfo(version uint64, cInfo *proof.CommitInfo)
 func (m *MetadataStore) flushRemovedStoreKeys(version uint64, storeKeys []string) (err error) {
 	batch := m.kv.NewBatch()
 	defer func() {
-		err = batch.Close()
+		cErr := batch.Close()
+		if err == nil {
+			err = cErr
+		}
 	}()
 
 	for _, storeKey := range storeKeys {