From 831103b6b9daef4bab44c26dac7e72f30864768d Mon Sep 17 00:00:00 2001
From: Sydonian <794346190@qq.com>
Date: Mon, 4 Sep 2023 16:17:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96distlock=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/internal/cmdline/distlock.go     | 5 +----
 common/assets/confs/agent.config.json   | 2 --
 common/assets/confs/client.config.json  | 2 --
 common/assets/confs/scanner.config.json | 2 --
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/client/internal/cmdline/distlock.go b/client/internal/cmdline/distlock.go
index 07909bb..eae07bc 100644
--- a/client/internal/cmdline/distlock.go
+++ b/client/internal/cmdline/distlock.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/samber/lo"
 	"gitlink.org.cn/cloudream/common/pkgs/distlock"
-	"gitlink.org.cn/cloudream/common/pkgs/distlock/service"
 	"gitlink.org.cn/cloudream/storage/common/pkgs/distlock/lockprovider"
 )
 
@@ -22,9 +21,7 @@ func DistLockLock(ctx CommandContext, lockData []string) error {
 		req.Locks = append(req.Locks, l)
 	}
 
-	reqID, err := ctx.Cmdline.Svc.DistLock.Acquire(req, service.AcquireOption{
-		RetryTimeMs: 5000,
-	})
+	reqID, err := ctx.Cmdline.Svc.DistLock.Acquire(req)
 	if err != nil {
 		return fmt.Errorf("acquire locks failed, err: %w", err)
 	}
diff --git a/common/assets/confs/agent.config.json b/common/assets/confs/agent.config.json
index 34200e9..bff9b8f 100644
--- a/common/assets/confs/agent.config.json
+++ b/common/assets/confs/agent.config.json
@@ -31,9 +31,7 @@
         "etcdAddress": "127.0.0.1:2379",
         "etcdUsername": "",
         "etcdPassword": "",
-        "etcdLockAcquireTimeoutMs": 5000,
         "etcdLockLeaseTimeSec": 5,
-        "lockRequestLeaseTimeSec": 5,
         "submitLockRequestWithoutLease": true
     }
 }
\ No newline at end of file
diff --git a/common/assets/confs/client.config.json b/common/assets/confs/client.config.json
index f9d97e6..0158e8b 100644
--- a/common/assets/confs/client.config.json
+++ b/common/assets/confs/client.config.json
@@ -23,9 +23,7 @@
         "etcdAddress": "127.0.0.1:2379",
         "etcdUsername": "",
         "etcdPassword": "",
-        "etcdLockAcquireTimeoutMs": 5000,
         "etcdLockLeaseTimeSec": 5,
-        "lockRequestLeaseTimeSec": 5,
         "submitLockRequestWithoutLease": true
     }
 }
\ No newline at end of file
diff --git a/common/assets/confs/scanner.config.json b/common/assets/confs/scanner.config.json
index 78644ff..199a237 100644
--- a/common/assets/confs/scanner.config.json
+++ b/common/assets/confs/scanner.config.json
@@ -23,9 +23,7 @@
         "etcdAddress": "127.0.0.1:2379",
         "etcdUsername": "",
         "etcdPassword": "",
-        "etcdLockAcquireTimeoutMs": 5000,
         "etcdLockLeaseTimeSec": 5,
-        "lockRequestLeaseTimeSec": 5,
         "submitLockRequestWithoutLease": true
     }
 }
\ No newline at end of file