diff options
| author | chrislu <chris.lu@gmail.com> | 2023-09-18 18:47:34 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-09-18 18:47:34 -0700 |
| commit | 27af11f1e80d738ed495dfca9766c913fd67a7ca (patch) | |
| tree | a4a54f1e1211e273bede5ecc39ed9513316c596d /weed/cluster | |
| parent | 0bb97709d41b1be4c74f01dcc65aac6d5f88bd16 (diff) | |
| download | seaweedfs-27af11f1e80d738ed495dfca9766c913fd67a7ca.tar.xz seaweedfs-27af11f1e80d738ed495dfca9766c913fd67a7ca.zip | |
Revert "Revert "Merge branch 'master' into sub""
This reverts commit 0bb97709d41b1be4c74f01dcc65aac6d5f88bd16.
Diffstat (limited to 'weed/cluster')
| -rw-r--r-- | weed/cluster/lock_manager/lock_manager.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/weed/cluster/lock_manager/lock_manager.go b/weed/cluster/lock_manager/lock_manager.go index 0e3e47ba4..49b951dd9 100644 --- a/weed/cluster/lock_manager/lock_manager.go +++ b/weed/cluster/lock_manager/lock_manager.go @@ -139,7 +139,7 @@ func (lm *LockManager) InsertLock(path string, expiredAtNs int64, token string, func (lm *LockManager) GetLockOwner(key string) (owner string, err error) { lm.locks.Range(func(k string, lock *Lock) bool { - if k == key { + if k == key && lock != nil { owner = lock.Owner return false } |