Skip to content

Commit b30d511

Browse files
AmoebaProtozoajjshanks
authored andcommitted
domain: release server id by revoke etcd session (pingcap#64192)
close pingcap#64191
1 parent 10e98cd commit b30d511

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

pkg/domain/domain.go

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff 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

0 commit comments

Comments
 (0)