fix: verify through the cache first, then delete (#1135)

apache · Jul 7, 2022 · 93c10e6 · 93c10e6
1 parent a642b14
commit 93c10e6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/pkg/apisix/pluginconfig.go b/pkg/apisix/pluginconfig.go
@@ -183,21 +183,22 @@ func (pc *pluginConfigClient) Delete(ctx context.Context, obj *v1.PluginConfig)
 		zap.String("cluster", "default"),
 		zap.String("url", pc.url),
 	)
+
 	if err := pc.cluster.HasSynced(ctx); err != nil {
 		return err
 	}
-	url := pc.url + "/" + obj.ID
-	if err := pc.cluster.deleteResource(ctx, url, "pluginConfig"); err != nil {
-		pc.cluster.metricsCollector.IncrAPISIXRequest("pluginConfig")
-		return err
-	}
-	pc.cluster.metricsCollector.IncrAPISIXRequest("pluginConfig")
 	if err := pc.cluster.cache.DeletePluginConfig(obj); err != nil {
 		log.Errorf("failed to reflect pluginConfig delete to cache: %s", err)
 		if err != cache.ErrNotFound {
 			return err
 		}
 	}
+	url := pc.url + "/" + obj.ID
+	if err := pc.cluster.deleteResource(ctx, url, "pluginConfig"); err != nil {
+		pc.cluster.metricsCollector.IncrAPISIXRequest("pluginConfig")
+		return err
+	}
+	pc.cluster.metricsCollector.IncrAPISIXRequest("pluginConfig")
 	return nil
 }
 

diff --git a/pkg/apisix/upstream.go b/pkg/apisix/upstream.go
@@ -178,24 +178,24 @@ func (u *upstreamClient) Delete(ctx context.Context, obj *v1.Upstream) error {
 		zap.String("url", u.url),
 	)
 
-	if err := u.cluster.upstreamServiceRelation.Delete(ctx, &v1.UpstreamServiceRelation{UpstreamName: obj.Name}); err != nil {
-		log.Errorf("failed to delete upstreamService in cache: %s", err)
-	}
 	if err := u.cluster.HasSynced(ctx); err != nil {
 		return err
 	}
-	url := u.url + "/" + obj.ID
-	if err := u.cluster.deleteResource(ctx, url, "upstream"); err != nil {
-		u.cluster.metricsCollector.IncrAPISIXRequest("upstream")
-		return err
-	}
-	u.cluster.metricsCollector.IncrAPISIXRequest("upstream")
 	if err := u.cluster.cache.DeleteUpstream(obj); err != nil {
 		log.Errorf("failed to reflect upstream delete to cache: %s", err.Error())
 		if err != cache.ErrNotFound {
 			return err
 		}
 	}
+	if err := u.cluster.upstreamServiceRelation.Delete(ctx, &v1.UpstreamServiceRelation{UpstreamName: obj.Name}); err != nil {
+		log.Errorf("failed to delete upstreamService in cache: %s", err)
+	}
+	url := u.url + "/" + obj.ID
+	if err := u.cluster.deleteResource(ctx, url, "upstream"); err != nil {
+		u.cluster.metricsCollector.IncrAPISIXRequest("upstream")
+		return err
+	}
+	u.cluster.metricsCollector.IncrAPISIXRequest("upstream")
 	return nil
 }