From 93746862fcaa43c27f6da8e33334e7dfbc1302ba Mon Sep 17 00:00:00 2001 From: chuntaojun Date: Mon, 27 Dec 2021 10:10:47 +0800 Subject: [PATCH 1/4] fix: fix issue #1687 --- registry/polaris/registry.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/registry/polaris/registry.go b/registry/polaris/registry.go index d95ea8e59a..27464a0c1b 100644 --- a/registry/polaris/registry.go +++ b/registry/polaris/registry.go @@ -291,7 +291,7 @@ func createRegisterParam(url *common.URL, serviceName string) *api.InstanceRegis }) metadata[constant.PolarisDubboPath] = url.Path - return &api.InstanceRegisterRequest{ + req := &api.InstanceRegisterRequest{ InstanceRegisterRequest: model.InstanceRegisterRequest{ Service: serviceName, Namespace: url.GetParam(constant.PolarisNamespace, constant.PolarisDefaultNamespace), @@ -301,6 +301,10 @@ func createRegisterParam(url *common.URL, serviceName string) *api.InstanceRegis Metadata: metadata, }, } + + req.SetTTL(5) + + return req } // createDeregisterParam convert dubbo url to polaris instance deregister request From 73413da38a638dd1c222f8916cb70f575963d9c7 Mon Sep 17 00:00:00 2001 From: chuntaojun Date: Mon, 27 Dec 2021 14:42:36 +0800 Subject: [PATCH 2/4] refactor: fix cr issue --- registry/polaris/registry.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/registry/polaris/registry.go b/registry/polaris/registry.go index 27464a0c1b..ba82a25eed 100644 --- a/registry/polaris/registry.go +++ b/registry/polaris/registry.go @@ -46,7 +46,8 @@ var localIP = "" const ( // RegistryConnDelay registry connection delay - RegistryConnDelay = 3 + RegistryConnDelay = 3 + defaultHeartbeatIntervalSec = 5 ) func init() { @@ -302,7 +303,7 @@ func createRegisterParam(url *common.URL, serviceName string) *api.InstanceRegis }, } - req.SetTTL(5) + req.SetTTL(defaultHeartbeatIntervalSec) return req } From 241e2390c2987bda0a17ef8a057644853a7606b0 Mon Sep 17 00:00:00 2001 From: chuntaojun Date: Mon, 27 Dec 2021 14:55:22 +0800 Subject: [PATCH 3/4] style: fix code style --- registry/polaris/registry.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registry/polaris/registry.go b/registry/polaris/registry.go index ba82a25eed..1417ba9366 100644 --- a/registry/polaris/registry.go +++ b/registry/polaris/registry.go @@ -46,7 +46,7 @@ var localIP = "" const ( // RegistryConnDelay registry connection delay - RegistryConnDelay = 3 + RegistryConnDelay = 3 defaultHeartbeatIntervalSec = 5 ) From 7801449fa7d46fd8021282fef986be20db48463a Mon Sep 17 00:00:00 2001 From: LaurenceLiZhixin <382673304@qq.com> Date: Wed, 5 Jan 2022 16:58:03 +0800 Subject: [PATCH 4/4] Fix: nacos -> polaris --- registry/polaris/service_discovery.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/registry/polaris/service_discovery.go b/registry/polaris/service_discovery.go index 6ae06c8401..605be176a3 100644 --- a/registry/polaris/service_discovery.go +++ b/registry/polaris/service_discovery.go @@ -94,9 +94,9 @@ func (polaris *polarisServiceDiscovery) Destroy() error { inst.cancel() err := polaris.Unregister(inst.instance) - logger.Infof("Unregister nacos instance:%+v", inst) + logger.Infof("Unregister polaris instance:%+v", inst) if err != nil { - logger.Errorf("Unregister nacos instance:%+v, err:%+v", inst, err) + logger.Errorf("Unregister polaris instance:%+v, err:%+v", inst, err) } } polaris.provider.Destroy()