zlei6/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2026-05-14 18:30:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Issue with etcd key disappearing and unable to auto-re-register (#4960)

Browse Source
This commit is contained in:
guonaihong
2025-08-01 22:54:07 +08:00
committed by GitHub
parent d150248c52
commit ee6b7cee79
2 changed files with 135 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/discov/publisher.go
View File

@@ -125,6 +125,7 @@ func (p *Publisher) keepAliveAsync(cli internal.EtcdClient) error {
}
threading.GoSafe(func() {
watchChan := cli.Watch(cli.Ctx(), p.fullKey, clientv3.WithFilterPut())
for {
select {
case _, ok := <-ch:
@@ -135,6 +136,24 @@ func (p *Publisher) keepAliveAsync(cli internal.EtcdClient) error {
}
return
}
case c := <-watchChan:
if c.Err() != nil {
logc.Errorf(cli.Ctx(), "etcd publisher watch: %s", c.Err().Error())
if err := p.doKeepAlive(); err != nil {
logc.Errorf(cli.Ctx(), "etcd publisher KeepAlive: %s", err.Error())
}
return
}
if c.Events[0].Type == clientv3.EventTypeDelete {
logc.Infof(cli.Ctx(), "etcd publisher watch: %s, event: %v", c.Events[0].Kv.Key, c.Events[0].Type)
_, err := cli.Put(cli.Ctx(), p.fullKey, p.value, clientv3.WithLease(p.lease))
if err != nil {
logc.Errorf(cli.Ctx(), "etcd publisher re-put key: %s", err.Error())
} else {
logc.Infof(cli.Ctx(), "etcd publisher re-put key: %s, value: %s", p.fullKey, p.value)
}
}
case <-p.pauseChan:
logc.Infof(cli.Ctx(), "paused etcd renew, key: %s, value: %s", p.key, p.value)
p.revoke(cli)