meta: skip cleaning session when sid is 0 (#4133)

juicedata · Nov 1, 2023 · e39c4a6 · e39c4a6
1 parent c270084
commit e39c4a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pkg/meta/base.go b/pkg/meta/base.go
@@ -613,8 +613,12 @@ func (m *baseMeta) CloseSession() error {
 	m.sesMu.Lock()
 	m.umounting = true
 	m.sesMu.Unlock()
-	logger.Infof("close session %d: %s", m.sid, m.en.doCleanStaleSession(m.sid))
-	return nil
+	var err error
+	if m.sid > 0 {
+		err = m.en.doCleanStaleSession(m.sid)
+	}
+	logger.Infof("close session %d: %s", m.sid, err)
+	return err
 }
 
 func (m *baseMeta) checkQuota(ctx Context, space, inodes int64, parents ...Ino) syscall.Errno {

diff --git a/pkg/meta/sql.go b/pkg/meta/sql.go
@@ -2057,7 +2057,7 @@ func (m *dbMeta) doCleanStaleSession(sid uint64) error {
 		return nil
 	})
 	if err != nil {
-		logger.Warnf("Delete flock/plock with sid %d: %d", sid, err)
+		logger.Warnf("Delete flock/plock with sid %d: %s", sid, err)
 		fail = true
 	}