File tree Expand file tree Collapse file tree 1 file changed +12
-5
lines changed Expand file tree Collapse file tree 1 file changed +12
-5
lines changed Original file line number Diff line number Diff line change @@ -2691,12 +2691,19 @@ func (do *Domain) releaseServerID(context.Context) {
26912691 if do .etcdClient == nil {
26922692 return
26932693 }
2694- key := fmt .Sprintf ("%s/%v" , serverIDEtcdPath , serverID )
2695- err := etcd .DeleteKeyFromEtcd (key , do .etcdClient , refreshServerIDRetryCnt , acquireServerIDTimeout )
2696- if err != nil {
2697- logutil .BgLogger ().Error ("releaseServerID fail" , zap .Uint64 ("serverID" , serverID ), zap .Error (err ))
2694+
2695+ // closing session releases attached server id and etcd lease.
2696+ leaseID := int64 (do .serverIDSession .Lease ())
2697+ if err := do .serverIDSession .Close (); err != nil {
2698+ logutil .BgLogger ().Error ("releaseServerID fail" ,
2699+ zap .Uint64 ("serverID" , serverID ),
2700+ zap .Int64 ("leaseID" , leaseID ),
2701+ zap .Error (err ))
26982702 } else {
2699- logutil .BgLogger ().Info ("releaseServerID succeed" , zap .Uint64 ("serverID" , serverID ))
2703+ logutil .BgLogger ().Info ("releaseServerID succeed" ,
2704+ zap .Uint64 ("serverID" , serverID ),
2705+ zap .Int64 ("leaseID" , leaseID ),
2706+ )
27002707 }
27012708}
27022709
You can’t perform that action at this time.
0 commit comments