Merge pull request #1157 from jack15083/3.0

Fix:delete a service provider when using k8s hpa (3.0)
apache · Apr 17, 2021 · 0bd7945 · 0bd7945
2 parents ea7f4e7 + faf3bfb
commit 0bd7945
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/common/url.go b/common/url.go
@@ -344,6 +344,16 @@ func (c *URL) Key() string {
 	return buildString
 }
 
+//GetCacheInvokerMapKey get directory cacheInvokerMap key
+func (c *URL) GetCacheInvokerMapKey() string {
+	urlNew, _ := NewURL(c.PrimitiveURL)
+
+	buildString := fmt.Sprintf("%s://%s:%s@%s:%s/?interface=%s&group=%s&version=%s&timestamp=%s",
+		c.Protocol, c.Username, c.Password, c.Ip, c.Port, c.Service(), c.GetParam(constant.GROUP_KEY, ""),
+		c.GetParam(constant.VERSION_KEY, ""), urlNew.GetParam(constant.TIMESTAMP_KEY, ""))
+	return buildString
+}
+
 // ServiceKey gets a unique key of a service.
 func (c *URL) ServiceKey() string {
 	return ServiceKey(c.GetParam(constant.INTERFACE_KEY, strings.TrimPrefix(c.Path, "/")),

diff --git a/registry/directory/directory.go b/registry/directory/directory.go
@@ -224,7 +224,7 @@ func (dir *RegistryDirectory) invokerCacheKey(event *registry.ServiceEvent) stri
 	referenceUrl := dir.GetDirectoryUrl().SubURL
 	newUrl := common.MergeURL(event.Service, referenceUrl)
 	event.Update(newUrl)
-	return newUrl.Key()
+	return newUrl.GetCacheInvokerMapKey()
 }
 
 // setNewInvokers groups the invokers from the cache first, then set the result to both directory and router chain.
@@ -317,7 +317,7 @@ func (dir *RegistryDirectory) toGroupInvokers() []protocol.Invoker {
 
 // uncacheInvoker will return abandoned Invoker, if no Invoker to be abandoned, return nil
 func (dir *RegistryDirectory) uncacheInvoker(url *common.URL) protocol.Invoker {
-	return dir.uncacheInvokerWithKey(url.Key())
+	return dir.uncacheInvokerWithKey(url.GetCacheInvokerMapKey())
 }
 
 func (dir *RegistryDirectory) uncacheInvokerWithKey(key string) protocol.Invoker {
@@ -356,7 +356,7 @@ func (dir *RegistryDirectory) cacheInvoker(url *common.URL) protocol.Invoker {
 }
 
 func (dir *RegistryDirectory) doCacheInvoker(newUrl *common.URL) (protocol.Invoker, bool) {
-	key := newUrl.Key()
+	key := newUrl.GetCacheInvokerMapKey()
 	if cacheInvoker, ok := dir.cacheInvokersMap.Load(key); !ok {
 		logger.Debugf("service will be added in cache invokers: invokers url is  %s!", newUrl)
 		newInvoker := extension.GetProtocol(protocolwrapper.FILTER).Refer(newUrl)

diff --git a/registry/event.go b/registry/event.go
@@ -69,7 +69,7 @@ func (e *ServiceEvent) Key() string {
 	if len(e.key) > 0 {
 		return e.key
 	}
-	e.key = e.Service.Key()
+	e.key = e.Service.GetCacheInvokerMapKey()
 	return e.key
 }