Merge pull request '优化distlock的配置文件' (#3) from feature_gxh into master

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)
 	}

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
     }
 }

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
     }
 }

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
     }
 }