Merge remote-tracking branch 'origin/3.0' into 3.0
diff --git a/registry/polaris/registry.go b/registry/polaris/registry.go
index 255acdb..e1ef292 100644
--- a/registry/polaris/registry.go
+++ b/registry/polaris/registry.go
@@ -171,7 +171,8 @@
watcher, err := newPolarisWatcher(&newParam, newConsumer)
if err != nil {
logger.Warnf("getwatcher() = err:%v", perrors.WithStack(err))
- <-time.After(time.Duration(RegistryConnDelay) * time.Second)
+ timer := time.NewTimer(time.Duration(RegistryConnDelay) * time.Second)
+ timer.Reset(time.Duration(RegistryConnDelay) * time.Second)
continue
}
for {
