From 66dd161b6bae7b612e8de967afbf239aa96510e8 Mon Sep 17 00:00:00 2001
From: zhijian <djx@juicedata.io>
Date: Thu, 14 Mar 2024 18:54:50 +0800
Subject: [PATCH] pass next fh id

---
 pkg/vfs/handle.go | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkg/vfs/handle.go b/pkg/vfs/handle.go
index ea92ac06619a..4d7d34cd617c 100644
--- a/pkg/vfs/handle.go
+++ b/pkg/vfs/handle.go
@@ -276,6 +276,11 @@ func (v *VFS) invalidateDirHandle(parent Ino, name string, inode Ino, attr *Attr
 	}
 }
 
+type state struct {
+	Handler map[uint64]saveHandle
+	NextFh  uint64
+}
+
 type saveHandle struct {
 	Inode      uint64
 	Length     uint64
@@ -289,8 +294,8 @@ type saveHandle struct {
 func (v *VFS) dumpAllHandles(path string) (err error) {
 	v.hanleM.Lock()
 	defer v.hanleM.Unlock()
-
-	var toSave = make(map[uint64]saveHandle)
+	var vfsState state
+	vfsState.Handler = make(map[uint64]saveHandle)
 	for ino, hs := range v.handles {
 		if ino == logInode {
 			continue // will be recovered
@@ -319,10 +324,11 @@ func (v *VFS) dumpAllHandles(path string) (err error) {
 				Off:        h.off,
 				Data:       hex.EncodeToString(h.data),
 			}
-			toSave[h.fh] = s
+			vfsState.Handler[h.fh] = s
 		}
 	}
-	d, err := json.Marshal(toSave)
+	vfsState.NextFh = v.nextfh
+	d, err := json.Marshal(vfsState)
 	if err != nil {
 		return err
 	}
@@ -348,14 +354,14 @@ func (v *VFS) loadAllHandles(path string) error {
 	if err != nil {
 		return err
 	}
-	var toRestore map[uint64]saveHandle
-	err = json.Unmarshal(d, &toRestore)
+	var vfsState state
+	err = json.Unmarshal(d, &vfsState)
 	if err != nil {
 		return err
 	}
 	v.hanleM.Lock()
 	defer v.hanleM.Unlock()
-	for fh, s := range toRestore {
+	for fh, s := range vfsState.Handler {
 		data, err := hex.DecodeString(s.Data)
 		if err != nil {
 			logger.Warnf("decode data for inode %d: %s", s.Inode, err)
@@ -385,6 +391,7 @@ func (v *VFS) loadAllHandles(path string) error {
 	if len(v.handleIno) > 0 {
 		logger.Infof("load %d handles from %s", len(v.handleIno), path)
 	}
+	v.nextfh = vfsState.NextFh
 	// _ = os.Remove(path)
 	return nil
 }