meta/redis: fix unlock on not-existed lock (#2325)

juicedata · Jul 1, 2022 · 3ade892 · 3ade892
1 parent 6dbc25b
commit 3ade892
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/pkg/meta/base_test.go b/pkg/meta/base_test.go
@@ -635,6 +635,9 @@ func testLocks(t *testing.T, m Meta) {
 	}
 
 	// POSIX locks
+	if st := m.Setlk(ctx, inode, o1, false, syscall.F_UNLCK, 0, 0xFFFF, 1); st != 0 {
+		t.Fatalf("plock unlock: %s", st)
+	}
 	if st := m.Setlk(ctx, inode, o1, false, syscall.F_RDLCK, 0, 0xFFFF, 1); st != 0 {
 		t.Fatalf("plock rlock: %s", st)
 	}

diff --git a/pkg/meta/redis.go b/pkg/meta/redis.go
@@ -2224,7 +2224,7 @@ func (m *redisMeta) cleanupZeroRef(key string) {
 	var ctx = Background
 	_ = m.txn(ctx, func(tx *redis.Tx) error {
 		v, err := tx.HGet(ctx, m.sliceRefs(), key).Int()
-		if err != nil {
+		if err != nil && err != redis.Nil {
 			return err
 		}
 		if v != 0 {

diff --git a/pkg/meta/redis_lock.go b/pkg/meta/redis_lock.go
@@ -140,7 +140,7 @@ func (r *redisMeta) Setlk(ctx Context, inode Ino, owner uint64, block bool, ltyp
 		err = r.txn(ctx, func(tx *redis.Tx) error {
 			if ltype == F_UNLCK {
 				d, err := tx.HGet(ctx, ikey, lkey).Result()
-				if err != nil {
+				if err != nil && err != redis.Nil {
 					return err
 				}
 				ls := loadLocks([]byte(d))