aboutsummaryrefslogtreecommitdiff
path: root/weed/cluster
diff options
context:
space:
mode:
Diffstat (limited to 'weed/cluster')
-rw-r--r--weed/cluster/lock_client.go8
-rw-r--r--weed/cluster/lock_manager/distributed_lock_manager.go4
-rw-r--r--weed/cluster/lock_manager/lock_manager.go30
-rw-r--r--weed/cluster/lock_manager/lock_ring.go8
-rw-r--r--weed/cluster/master_client.go6
5 files changed, 28 insertions, 28 deletions
diff --git a/weed/cluster/lock_client.go b/weed/cluster/lock_client.go
index 6618f5d2f..70f4c23a6 100644
--- a/weed/cluster/lock_client.go
+++ b/weed/cluster/lock_client.go
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
"github.com/seaweedfs/seaweedfs/weed/cluster/lock_manager"
- "github.com/seaweedfs/seaweedfs/weed/glog"
+ "github.com/seaweedfs/seaweedfs/weed/util/log"
"github.com/seaweedfs/seaweedfs/weed/pb"
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
"github.com/seaweedfs/seaweedfs/weed/util"
@@ -73,7 +73,7 @@ func (lc *LockClient) StartLongLivedLock(key string, owner string, onLockOwnerCh
for {
if isLocked {
if err := lock.AttemptToLock(lock_manager.LiveLockTTL); err != nil {
- glog.V(0).Infof("Lost lock %s: %v", key, err)
+ log.V(3).Infof("Lost lock %s: %v", key, err)
isLocked = false
}
} else {
@@ -82,7 +82,7 @@ func (lc *LockClient) StartLongLivedLock(key string, owner string, onLockOwnerCh
}
}
if lockOwner != lock.LockOwner() && lock.LockOwner() != "" {
- glog.V(0).Infof("Lock owner changed from %s to %s", lockOwner, lock.LockOwner())
+ log.V(3).Infof("Lock owner changed from %s to %s", lockOwner, lock.LockOwner())
onLockOwnerChange(lock.LockOwner())
lockOwner = lock.LockOwner()
}
@@ -102,7 +102,7 @@ func (lock *LiveLock) retryUntilLocked(lockDuration time.Duration) {
return lock.AttemptToLock(lockDuration)
}, func(err error) (shouldContinue bool) {
if err != nil {
- glog.Warningf("create lock %s: %s", lock.key, err)
+ log.Warningf("create lock %s: %s", lock.key, err)
}
return lock.renewToken == ""
})
diff --git a/weed/cluster/lock_manager/distributed_lock_manager.go b/weed/cluster/lock_manager/distributed_lock_manager.go
index 7de78410f..8b61063a2 100644
--- a/weed/cluster/lock_manager/distributed_lock_manager.go
+++ b/weed/cluster/lock_manager/distributed_lock_manager.go
@@ -2,7 +2,7 @@ package lock_manager
import (
"fmt"
- "github.com/seaweedfs/seaweedfs/weed/glog"
+ "github.com/seaweedfs/seaweedfs/weed/util/log"
"github.com/seaweedfs/seaweedfs/weed/pb"
"time"
)
@@ -56,7 +56,7 @@ func (dlm *DistributedLockManager) FindLockOwner(key string) (owner string, move
}
if movedTo != dlm.Host {
servers := dlm.LockRing.GetSnapshot()
- glog.V(0).Infof("lock %s not on current %s but on %s from %v", key, dlm.Host, movedTo, servers)
+ log.V(3).Infof("lock %s not on current %s but on %s from %v", key, dlm.Host, movedTo, servers)
return
}
owner, err = dlm.lockManager.GetLockOwner(key)
diff --git a/weed/cluster/lock_manager/lock_manager.go b/weed/cluster/lock_manager/lock_manager.go
index ebc9dfeaa..d454a3a56 100644
--- a/weed/cluster/lock_manager/lock_manager.go
+++ b/weed/cluster/lock_manager/lock_manager.go
@@ -3,7 +3,7 @@ package lock_manager
import (
"fmt"
"github.com/google/uuid"
- "github.com/seaweedfs/seaweedfs/weed/glog"
+ "github.com/seaweedfs/seaweedfs/weed/util/log"
"sync"
"time"
)
@@ -38,19 +38,19 @@ func (lm *LockManager) Lock(path string, expiredAtNs int64, token string, owner
lm.accessLock.Lock()
defer lm.accessLock.Unlock()
- glog.V(4).Infof("lock %s %v %v %v", path, time.Unix(0, expiredAtNs), token, owner)
+ log.V(-1).Infof("lock %s %v %v %v", path, time.Unix(0, expiredAtNs), token, owner)
if oldValue, found := lm.locks[path]; found {
if oldValue.ExpiredAtNs > 0 && oldValue.ExpiredAtNs < time.Now().UnixNano() {
// lock is expired, set to a new lock
if token != "" {
- glog.V(4).Infof("lock expired key %s non-empty token %v owner %v ts %s", path, token, owner, time.Unix(0, oldValue.ExpiredAtNs))
+ log.V(-1).Infof("lock expired key %s non-empty token %v owner %v ts %s", path, token, owner, time.Unix(0, oldValue.ExpiredAtNs))
err = LockErrorNonEmptyTokenOnExpiredLock
return
} else {
// new lock
renewToken = uuid.New().String()
- glog.V(4).Infof("key %s new token %v owner %v", path, renewToken, owner)
+ log.V(-1).Infof("key %s new token %v owner %v", path, renewToken, owner)
lm.locks[path] = &Lock{Token: renewToken, ExpiredAtNs: expiredAtNs, Owner: owner}
return
}
@@ -60,30 +60,30 @@ func (lm *LockManager) Lock(path string, expiredAtNs int64, token string, owner
if oldValue.Token == token {
// token matches, renew the lock
renewToken = uuid.New().String()
- glog.V(4).Infof("key %s old token %v owner %v => %v owner %v", path, oldValue.Token, oldValue.Owner, renewToken, owner)
+ log.V(-1).Infof("key %s old token %v owner %v => %v owner %v", path, oldValue.Token, oldValue.Owner, renewToken, owner)
lm.locks[path] = &Lock{Token: renewToken, ExpiredAtNs: expiredAtNs, Owner: owner}
return
} else {
if token == "" {
// new lock
- glog.V(4).Infof("key %s locked by %v", path, oldValue.Owner)
+ log.V(-1).Infof("key %s locked by %v", path, oldValue.Owner)
err = fmt.Errorf("lock already owned by %v", oldValue.Owner)
return
}
- glog.V(4).Infof("key %s expected token %v owner %v received %v from %v", path, oldValue.Token, oldValue.Owner, token, owner)
+ log.V(-1).Infof("key %s expected token %v owner %v received %v from %v", path, oldValue.Token, oldValue.Owner, token, owner)
err = fmt.Errorf("lock: token mismatch")
return
}
} else {
- glog.V(4).Infof("key %s no lock owner %v", path, owner)
+ log.V(-1).Infof("key %s no lock owner %v", path, owner)
if token == "" {
// new lock
- glog.V(4).Infof("key %s new token %v owner %v", path, token, owner)
+ log.V(-1).Infof("key %s new token %v owner %v", path, token, owner)
renewToken = uuid.New().String()
lm.locks[path] = &Lock{Token: renewToken, ExpiredAtNs: expiredAtNs, Owner: owner}
return
} else {
- glog.V(4).Infof("key %s non-empty token %v owner %v", path, token, owner)
+ log.V(-1).Infof("key %s non-empty token %v owner %v", path, token, owner)
err = LockErrorNonEmptyTokenOnNewLock
return
}
@@ -99,13 +99,13 @@ func (lm *LockManager) Unlock(path string, token string) (isUnlocked bool, err e
if oldValue.ExpiredAtNs > 0 && oldValue.ExpiredAtNs < now.UnixNano() {
// lock is expired, delete it
isUnlocked = true
- glog.V(4).Infof("key %s expired at %v", path, time.Unix(0, oldValue.ExpiredAtNs))
+ log.V(-1).Infof("key %s expired at %v", path, time.Unix(0, oldValue.ExpiredAtNs))
delete(lm.locks, path)
return
}
if oldValue.Token == token {
isUnlocked = true
- glog.V(4).Infof("key %s unlocked with %v", path, token)
+ log.V(-1).Infof("key %s unlocked with %v", path, token)
delete(lm.locks, path)
return
} else {
@@ -130,7 +130,7 @@ func (lm *LockManager) CleanUp() {
continue
}
if now > value.ExpiredAtNs {
- glog.V(4).Infof("key %s expired at %v", key, time.Unix(0, value.ExpiredAtNs))
+ log.V(-1).Infof("key %s expired at %v", key, time.Unix(0, value.ExpiredAtNs))
delete(lm.locks, key)
}
}
@@ -148,12 +148,12 @@ func (lm *LockManager) SelectLocks(selectFn func(key string) bool) (locks []*Loc
for key, lock := range lm.locks {
if now > lock.ExpiredAtNs {
- glog.V(4).Infof("key %s expired at %v", key, time.Unix(0, lock.ExpiredAtNs))
+ log.V(-1).Infof("key %s expired at %v", key, time.Unix(0, lock.ExpiredAtNs))
delete(lm.locks, key)
continue
}
if selectFn(key) {
- glog.V(4).Infof("key %s selected and deleted", key)
+ log.V(-1).Infof("key %s selected and deleted", key)
delete(lm.locks, key)
lock.Key = key
locks = append(locks, lock)
diff --git a/weed/cluster/lock_manager/lock_ring.go b/weed/cluster/lock_manager/lock_ring.go
index e7f60e6d2..bc392ce94 100644
--- a/weed/cluster/lock_manager/lock_ring.go
+++ b/weed/cluster/lock_manager/lock_ring.go
@@ -1,7 +1,7 @@
package lock_manager
import (
- "github.com/seaweedfs/seaweedfs/weed/glog"
+ "github.com/seaweedfs/seaweedfs/weed/util/log"
"github.com/seaweedfs/seaweedfs/weed/pb"
"github.com/seaweedfs/seaweedfs/weed/util"
"sort"
@@ -40,11 +40,11 @@ func (r *LockRing) SetTakeSnapshotCallback(onTakeSnapshot func(snapshot []pb.Ser
// AddServer adds a server to the ring
// if the previous snapshot passed the snapshot interval, create a new snapshot
func (r *LockRing) AddServer(server pb.ServerAddress) {
- glog.V(0).Infof("add server %v", server)
+ log.V(3).Infof("add server %v", server)
r.Lock()
if _, found := r.candidateServers[server]; found {
- glog.V(0).Infof("add server: already exists %v", server)
+ log.V(3).Infof("add server: already exists %v", server)
r.Unlock()
return
}
@@ -56,7 +56,7 @@ func (r *LockRing) AddServer(server pb.ServerAddress) {
}
func (r *LockRing) RemoveServer(server pb.ServerAddress) {
- glog.V(0).Infof("remove server %v", server)
+ log.V(3).Infof("remove server %v", server)
r.Lock()
diff --git a/weed/cluster/master_client.go b/weed/cluster/master_client.go
index bab2360fe..27cad52da 100644
--- a/weed/cluster/master_client.go
+++ b/weed/cluster/master_client.go
@@ -3,7 +3,7 @@ package cluster
import (
"context"
- "github.com/seaweedfs/seaweedfs/weed/glog"
+ "github.com/seaweedfs/seaweedfs/weed/util/log"
"github.com/seaweedfs/seaweedfs/weed/pb"
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
"google.golang.org/grpc"
@@ -17,7 +17,7 @@ func ListExistingPeerUpdates(master pb.ServerAddress, grpcDialOption grpc.DialOp
FilerGroup: filerGroup,
})
- glog.V(0).Infof("the cluster has %d %s\n", len(resp.ClusterNodes), clientType)
+ log.V(3).Infof("the cluster has %d %s\n", len(resp.ClusterNodes), clientType)
for _, node := range resp.ClusterNodes {
existingNodes = append(existingNodes, &master_pb.ClusterNodeUpdate{
NodeType: FilerType,
@@ -28,7 +28,7 @@ func ListExistingPeerUpdates(master pb.ServerAddress, grpcDialOption grpc.DialOp
}
return err
}); grpcErr != nil {
- glog.V(0).Infof("connect to %s: %v", master, grpcErr)
+ log.V(3).Infof("connect to %s: %v", master, grpcErr)
}
return
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-20 23:32:11 +0000