From 9ce58a1deb782724ae560c371c359c4451c74e0b Mon Sep 17 00:00:00 2001 From: tiancaiamao Date: Mon, 28 Aug 2023 17:04:28 +0800 Subject: [PATCH 1/2] autoid_service,owner: change autoid service's etcd lease to 10s --- autoid_service/autoid.go | 2 +- owner/manager.go | 10 +++++++--- owner/mock.go | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/autoid_service/autoid.go b/autoid_service/autoid.go index b7d4e3ed6275b..4277839950953 100644 --- a/autoid_service/autoid.go +++ b/autoid_service/autoid.go @@ -280,7 +280,7 @@ func New(selfAddr string, etcdAddr []string, store kv.Storage, tlsConfig *tls.Co func newWithCli(selfAddr string, cli *clientv3.Client, store kv.Storage) *Service { l := owner.NewOwnerManager(context.Background(), cli, "autoid", selfAddr, autoIDLeaderPath) - err := l.CampaignOwner() + err := l.CampaignOwner(10) if err != nil { panic(err) } diff --git a/owner/manager.go b/owner/manager.go index dc9c7058cd2d6..f983b601f4451 100644 --- a/owner/manager.go +++ b/owner/manager.go @@ -53,7 +53,7 @@ type Manager interface { // SetOwnerOpValue updates the owner op value. SetOwnerOpValue(ctx context.Context, op OpType) error // CampaignOwner campaigns the owner. - CampaignOwner() error + CampaignOwner(...int) error // ResignOwner lets the owner start a new election. ResignOwner(ctx context.Context) error // Cancel cancels this etcd ownerManager. @@ -173,10 +173,14 @@ func setManagerSessionTTL() error { } // CampaignOwner implements Manager.CampaignOwner interface. -func (m *ownerManager) CampaignOwner() error { +func (m *ownerManager) CampaignOwner(withTTL ...int) error { + ttl := ManagerSessionTTL + if len(withTTL) == 1 { + ttl = withTTL[0] + } logPrefix := fmt.Sprintf("[%s] %s", m.prompt, m.key) logutil.BgLogger().Info("start campaign owner", zap.String("ownerInfo", logPrefix)) - session, err := util2.NewSession(m.ctx, logPrefix, m.etcdCli, util2.NewSessionDefaultRetryCnt, ManagerSessionTTL) + session, err := util2.NewSession(m.ctx, logPrefix, m.etcdCli, util2.NewSessionDefaultRetryCnt, ttl) if err != nil { return errors.Trace(err) } diff --git a/owner/mock.go b/owner/mock.go index 49c81104b8a22..fc7446835e3a2 100644 --- a/owner/mock.go +++ b/owner/mock.go @@ -124,7 +124,7 @@ func (*mockManager) SetOwnerOpValue(_ context.Context, op OpType) error { } // CampaignOwner implements Manager.CampaignOwner interface. -func (m *mockManager) CampaignOwner() error { +func (m *mockManager) CampaignOwner(withTTL ...int) error { m.wg.Add(1) go func() { logutil.BgLogger().Debug("owner manager campaign owner", zap.String("category", "ddl"), From aeb9349c51a76886994cff8ad1953f2980898616 Mon Sep 17 00:00:00 2001 From: tiancaiamao Date: Fri, 1 Sep 2023 15:49:44 +0800 Subject: [PATCH 2/2] fix lint check --- owner/mock.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/owner/mock.go b/owner/mock.go index fc7446835e3a2..4bddb0c8d6d08 100644 --- a/owner/mock.go +++ b/owner/mock.go @@ -124,7 +124,7 @@ func (*mockManager) SetOwnerOpValue(_ context.Context, op OpType) error { } // CampaignOwner implements Manager.CampaignOwner interface. -func (m *mockManager) CampaignOwner(withTTL ...int) error { +func (m *mockManager) CampaignOwner(_ ...int) error { m.wg.Add(1) go func() { logutil.BgLogger().Debug("owner manager campaign owner", zap.String("category", "ddl"),