lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-24 00:23:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename

Browse Source
This commit is contained in:
chrislu
2024-03-09 12:57:01 -08:00
parent e7823ee967
commit c1a5952009
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
weed/cluster/lock_client.go
View File

@@ -32,7 +32,7 @@ type LiveLock struct {
key string key string
renewToken string renewToken string
expireAtNs int64 expireAtNs int64
filer pb.ServerAddress hostFiler pb.ServerAddress
cancelCh chan struct{} cancelCh chan struct{}
grpcDialOption grpc.DialOption grpcDialOption grpc.DialOption
isLocked bool isLocked bool
@@ -45,7 +45,7 @@ type LiveLock struct {
func (lc *LockClient) NewShortLivedLock(key string, owner string) (lock *LiveLock) { func (lc *LockClient) NewShortLivedLock(key string, owner string) (lock *LiveLock) {
lock = &LiveLock{ lock = &LiveLock{
key: key, key: key,
filer: lc.seedFiler, hostFiler: lc.seedFiler,
cancelCh: make(chan struct{}), cancelCh: make(chan struct{}),
expireAtNs: time.Now().Add(5 * time.Second).UnixNano(), expireAtNs: time.Now().Add(5 * time.Second).UnixNano(),
grpcDialOption: lc.grpcDialOption, grpcDialOption: lc.grpcDialOption,
@@ -60,7 +60,7 @@ func (lc *LockClient) NewShortLivedLock(key string, owner string) (lock *LiveLoc
func (lc *LockClient) StartLongLivedLock(key string, owner string, onLockOwnerChange func(newLockOwner string)) (lock *LiveLock) { func (lc *LockClient) StartLongLivedLock(key string, owner string, onLockOwnerChange func(newLockOwner string)) (lock *LiveLock) {
lock = &LiveLock{ lock = &LiveLock{
key: key, key: key,
filer: lc.seedFiler, hostFiler: lc.seedFiler,
cancelCh: make(chan struct{}), cancelCh: make(chan struct{}),
expireAtNs: time.Now().Add(lock_manager.LiveLockTTL).UnixNano(), expireAtNs: time.Now().Add(lock_manager.LiveLockTTL).UnixNano(),
grpcDialOption: lc.grpcDialOption, grpcDialOption: lc.grpcDialOption,
@@ -129,7 +129,7 @@ func (lock *LiveLock) StopShortLivedLock() error {
defer func() { defer func() {
lock.isLocked = false lock.isLocked = false
}() }()
return pb.WithFilerClient(false, 0, lock.filer, lock.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error { return pb.WithFilerClient(false, 0, lock.hostFiler, lock.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error {
_, err := client.DistributedUnlock(context.Background(), &filer_pb.UnlockRequest{ _, err := client.DistributedUnlock(context.Background(), &filer_pb.UnlockRequest{
Name: lock.key, Name: lock.key,
RenewToken: lock.renewToken, RenewToken: lock.renewToken,
@@ -139,7 +139,7 @@ func (lock *LiveLock) StopShortLivedLock() error {
} }
func (lock *LiveLock) doLock(lockDuration time.Duration) (errorMessage string, err error) { func (lock *LiveLock) doLock(lockDuration time.Duration) (errorMessage string, err error) {
err = pb.WithFilerClient(false, 0, lock.filer, lock.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error { err = pb.WithFilerClient(false, 0, lock.hostFiler, lock.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error {
resp, err := client.DistributedLock(context.Background(), &filer_pb.LockRequest{ resp, err := client.DistributedLock(context.Background(), &filer_pb.LockRequest{
Name: lock.key, Name: lock.key,
SecondsToLock: int64(lockDuration.Seconds()), SecondsToLock: int64(lockDuration.Seconds()),
@@ -156,8 +156,8 @@ func (lock *LiveLock) doLock(lockDuration time.Duration) (errorMessage string, e
if resp != nil { if resp != nil {
errorMessage = resp.Error errorMessage = resp.Error
if resp.LockHostMovedTo != "" { if resp.LockHostMovedTo != "" {
lock.filer = pb.ServerAddress(resp.LockHostMovedTo) lock.hostFiler = pb.ServerAddress(resp.LockHostMovedTo)
lock.lc.seedFiler = lock.filer lock.lc.seedFiler = lock.hostFiler
} }
if resp.LockOwner != "" { if resp.LockOwner != "" {
lock.owner = resp.LockOwner lock.owner = resp.LockOwner