fix(registry/discovery): watch quit while context cancel; supplement metadata (#1524)

* fix(registry/discovery): watch quit with context cancel; lose metadata while translating ServiceInstance.
pull/1533/head
Yeqllo 3 years ago committed by GitHub
parent 74e630c21a
commit a2f53128cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 28
      contrib/registry/discovery/discovery_helper.go
  2. 9
      contrib/registry/discovery/impl_discover.go

@ -112,17 +112,25 @@ func toServiceInstance(ins *discoveryInstance) *registry.ServiceInstance {
return nil
}
md := map[string]string{
"region": ins.Region,
"zone": ins.Zone,
"lastTs": strconv.Itoa(int(ins.LastTs)),
"env": ins.Env,
"hostname": ins.Hostname,
}
if len(ins.Metadata) != 0 {
for k, v := range ins.Metadata {
md[k] = v
}
}
return &registry.ServiceInstance{
ID: ins.Metadata[_reservedInstanceIDKey],
Name: ins.AppID,
Version: ins.Version,
Metadata: map[string]string{
"region": ins.Region,
"zone": ins.Region,
"lastTs": strconv.Itoa(int(ins.LastTs)),
"env": ins.Env,
"hostname": ins.Hostname,
},
ID: ins.Metadata[_reservedInstanceIDKey],
Name: ins.AppID,
Version: ins.Version,
Metadata: md,
Endpoints: ins.Addrs,
}
}

@ -46,19 +46,26 @@ func (d *Discovery) Watch(ctx context.Context, serviceName string) (registry.Wat
return &watcher{
Resolve: d.resolveBuild(serviceName),
serviceName: serviceName,
cancelCtx: ctx,
}, nil
}
type watcher struct {
*Resolve
cancelCtx context.Context
serviceName string
}
func (w *watcher) Next() ([]*registry.ServiceInstance, error) {
event := w.Resolve.Watch()
select {
case <-event:
// change event come
<-event
case <-w.cancelCtx.Done():
return nil, fmt.Errorf("watch context cancelled: %v", w.cancelCtx.Err())
}
ctx, cancel := context.WithTimeout(context.TODO(), 15*time.Second)
defer cancel()

Loading…
Cancel
Save