fix the delete service issue in nacos registry (alibaba#553)

johnlanni · Sep 27, 2023 · d8c34bb · d8c34bb
1 parent 4e392d1
commit d8c34bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/registry/memory/cache.go b/registry/memory/cache.go
@@ -122,8 +122,8 @@ func (s *store) DeleteServiceEntryWrapper(service string) {
 
 	if data, exist := s.sew[service]; exist {
 		s.toBeDeleted = append(s.toBeDeleted, data)
+		s.deferedDelete[service] = struct{}{}
 	}
-	s.deferedDelete[service] = struct{}{}
 }
 
 // should only be called when reconcile is done

diff --git a/registry/nacos/v2/watcher.go b/registry/nacos/v2/watcher.go
@@ -484,7 +484,7 @@ func (w *watcher) Stop() {
 		}
 
 		// clean the cache
-		suffix := strings.Join([]string{s[0], w.NacosNamespace, w.Type}, common.DotSeparator)
+		suffix := strings.Join([]string{s[0], w.NacosNamespace, "nacos"}, common.DotSeparator)
 		suffix = strings.ReplaceAll(suffix, common.Underscore, common.Hyphen)
 		host := strings.Join([]string{s[1], suffix}, common.DotSeparator)
 		w.cache.DeleteServiceEntryWrapper(host)