Revert "Node should clear a lock internally that the lock owner don't recognize (#12782)"

This reverts commit 83676a0bc2ad9ff6fd4d2a52701ed20d1a10c169.
This commit is contained in:
Harshavardhana 2021-08-02 00:18:30 -07:00
parent 0a276a25cf
commit a6e8f4aa1c

View File

@ -22,7 +22,6 @@ import (
"errors" "errors"
"math/rand" "math/rand"
"net/http" "net/http"
"net/url"
"path" "path"
"sort" "sort"
"strconv" "strconv"
@ -304,7 +303,6 @@ func lockMaintenance(ctx context.Context, interval time.Duration) error {
for lendpoint, nlrips := range getLongLivedLocks(interval) { for lendpoint, nlrips := range getLongLivedLocks(interval) {
nlripsMap := make(map[string]nlock, len(nlrips)) nlripsMap := make(map[string]nlock, len(nlrips))
for _, nlrip := range nlrips { for _, nlrip := range nlrips {
expiredInOwner := false
for _, c := range allLockersFn() { for _, c := range allLockersFn() {
if !c.IsOnline() || c == nil { if !c.IsOnline() || c == nil {
continue continue
@ -327,18 +325,11 @@ func lockMaintenance(ctx context.Context, interval time.Duration) error {
if !expired { if !expired {
updateNlocks(nlripsMap, nlrip.name, nlrip.lri.Writer) updateNlocks(nlripsMap, nlrip.name, nlrip.lri.Writer)
} else {
// Check if the lock owner still recognizes the lock
u, err := url.Parse(c.String())
if err == nil && u.Host == nlrip.lri.Owner {
expiredInOwner = true
} }
} }
} // less than the quorum, we have locks expired.
if nlripsMap[nlrip.name].locks < nlrip.lri.Quorum {
// Remove the lock if Less than the quorum or the lock owner does not recognize it
if expiredInOwner || nlripsMap[nlrip.name].locks < nlrip.lri.Quorum {
// Purge the stale entry if it exists. // Purge the stale entry if it exists.
globalLockServers[lendpoint].removeEntryIfExists(nlrip) globalLockServers[lendpoint].removeEntryIfExists(nlrip)
} }