aboutsummaryrefslogtreecommitdiff
path: root/weed/cluster
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2023-09-18 16:13:20 -0700
committerchrislu <chris.lu@gmail.com>2023-09-18 16:13:20 -0700
commit0bb97709d41b1be4c74f01dcc65aac6d5f88bd16 (patch)
tree9be51ec65888a0741f63912c9bc125d0278d3360 /weed/cluster
parent8cb42c39adbbe7f082009cf91eccb4d2dc527235 (diff)
downloadseaweedfs-0bb97709d41b1be4c74f01dcc65aac6d5f88bd16.tar.xz
seaweedfs-0bb97709d41b1be4c74f01dcc65aac6d5f88bd16.zip
Revert "Merge branch 'master' into sub"
This reverts commit 4d414f54a224142f3f4d934f4af3b5dceb6fec6b, reversing changes made to 482742514656e9b5a652acf7406740fbc55db13d.
Diffstat (limited to 'weed/cluster')
-rw-r--r--weed/cluster/lock_manager/lock_manager.go2
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 49b951dd9..0e3e47ba4 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 && lock != nil {
+ if k == key {
owner = lock.Owner
return false
}