meta: fix snap not released if error occurs when dumping meta (#1669)

juicedata · Mar 29, 2022 · 68010fd · 68010fd
1 parent d52704e
commit 68010fd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pkg/meta/redis.go b/pkg/meta/redis.go
@@ -2884,6 +2884,7 @@ func (m *redisMeta) DumpMeta(w io.Writer, root Ino) (err error) {
 	var tree, trash *DumpedEntry
 	root = m.checkRoot(root)
 	if root == 1 {
+		defer func() { m.snap = nil }()
 		bar := progress.AddCountBar("Snapshot keys", m.rdb.DBSize(ctx).Val())
 		if err = m.makeSnap(bar); err != nil {
 			return errors.Errorf("Fetch all metadata from Redis: %s", err)
@@ -2983,7 +2984,6 @@ func (m *redisMeta) DumpMeta(w io.Writer, root Ino) (err error) {
 		return err
 	}
 	progress.Done()
-	m.snap = nil
 
 	return bw.Flush()
 }

diff --git a/pkg/meta/sql.go b/pkg/meta/sql.go
@@ -2529,6 +2529,7 @@ func (m *dbMeta) DumpMeta(w io.Writer, root Ino) (err error) {
 	var tree, trash *DumpedEntry
 	root = m.checkRoot(root)
 	if root == 1 {
+		defer func() { m.snap = nil }()
 		bar := progress.AddCountBar("Snapshot keys", 0)
 		if err = m.makeSnap(bar); err != nil {
 			return fmt.Errorf("Fetch all metadata from DB: %s", err)
@@ -2622,7 +2623,6 @@ func (m *dbMeta) DumpMeta(w io.Writer, root Ino) (err error) {
 		return err
 	}
 	progress.Done()
-	m.snap = nil
 
 	return bw.Flush()
 }

diff --git a/pkg/meta/tkv.go b/pkg/meta/tkv.go
@@ -2143,6 +2143,7 @@ func (m *kvMeta) DumpMeta(w io.Writer, root Ino) (err error) {
 		case *memKV:
 			m.snap = c
 		default:
+			defer func() { m.snap = nil }()
 			m.snap = &memKV{items: btree.New(2), temp: &kvItem{}}
 			bar := progress.AddCountBar("Snapshot keys", 0)
 			if err = m.txn(func(tx kvTxn) error {
@@ -2275,7 +2276,6 @@ func (m *kvMeta) DumpMeta(w io.Writer, root Ino) (err error) {
 		return err
 	}
 	progress.Done()
-	m.snap = nil
 
 	return bw.Flush()
 }