Merge pull request apolloconfig#1346 from nobodyiam/fix-public-appnamespace-deleted-and-recreated

nobodyiam · web-flow · commit 30da4eebc03d · 2018-08-09T00:19:50.000+08:00
fix the situation when some public app namespace is deleted and recreated in another app
diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AppNamespaceService.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AppNamespaceService.java
@@ -131,6 +131,12 @@ private void instanceOfAppNamespaceInAllCluster(String appId, String namespaceNa
     List<Cluster> clusters = clusterService.findParentClusters(appId);
 
     for (Cluster cluster : clusters) {
+
+      // in case there is some dirty data, e.g. public namespace deleted in other app and now created in this app
+      if (!namespaceService.isNamespaceUnique(appId, cluster.getName(), namespaceName)) {
+        continue;
+      }
+
       Namespace namespace = new Namespace();
       namespace.setClusterName(cluster.getName());
       namespace.setAppId(appId);
diff --git a/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/AppNamespaceServiceWithCache.java b/apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/AppNamespaceServiceWithCache.java
@@ -247,7 +247,11 @@ private void handleDeletedAppNamespaces(Set<Long> deletedIds) {
       }
       appNamespaceCache.remove(assembleAppNamespaceKey(deleted));
       if (deleted.isPublic()) {
-        publicAppNamespaceCache.remove(deleted.getName());
+        AppNamespace publicAppNamespace = publicAppNamespaceCache.get(deleted.getName());
+        // in case there is some dirty data, e.g. public namespace deleted in some app and now created in another app
+        if (publicAppNamespace == deleted) {
+          publicAppNamespaceCache.remove(deleted.getName());
+        }
       }
       logger.info("Found AppNamespace deleted, {}", deleted);
     }

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,11 @@ private void handleDeletedAppNamespaces(Set<Long> deletedIds) {`
`247`	`247`	`}`
`248`	`248`	`appNamespaceCache.remove(assembleAppNamespaceKey(deleted));`
`249`	`249`	`if (deleted.isPublic()) {`
`250`		`- publicAppNamespaceCache.remove(deleted.getName());`
	`250`	`+ AppNamespace publicAppNamespace = publicAppNamespaceCache.get(deleted.getName());`
	`251`	`+ // in case there is some dirty data, e.g. public namespace deleted in some app and now created in another app`
	`252`	`+ if (publicAppNamespace == deleted) {`
	`253`	`+ publicAppNamespaceCache.remove(deleted.getName());`
	`254`	`+ }`
`251`	`255`	`}`
`252`	`256`	`logger.info("Found AppNamespace deleted, {}", deleted);`
`253`	`257`	`}`