Skip to content

Commit 76bfd45

Browse files
authored
fix: Avoid retrying caused by 404 when deleting cache (#424)
1 parent bfc5882 commit 76bfd45

5 files changed

Lines changed: 15 additions & 5 deletions

File tree

pkg/apisix/global_rule.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,9 @@ func (r *globalRuleClient) Delete(ctx context.Context, obj *v1.GlobalRule) error
187187
}
188188
if err := r.cluster.cache.DeleteGlobalRule(obj); err != nil {
189189
log.Errorf("failed to reflect global_rule delete to cache: %s", err)
190-
return err
190+
if err != cache.ErrNotFound {
191+
return err
192+
}
191193
}
192194
return nil
193195
}

pkg/apisix/route.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,9 @@ func (r *routeClient) Delete(ctx context.Context, obj *v1.Route) error {
189189
}
190190
if err := r.cluster.cache.DeleteRoute(obj); err != nil {
191191
log.Errorf("failed to reflect route delete to cache: %s", err)
192-
return err
192+
if err != cache.ErrNotFound {
193+
return err
194+
}
193195
}
194196
return nil
195197
}

pkg/apisix/ssl.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ func (s *sslClient) Delete(ctx context.Context, obj *v1.Ssl) error {
185185
}
186186
if err := s.cluster.cache.DeleteSSL(obj); err != nil {
187187
log.Errorf("failed to reflect ssl delete to cache: %s", err)
188-
return err
188+
if err != cache.ErrNotFound {
189+
return err
190+
}
189191
}
190192
return nil
191193
}

pkg/apisix/stream_route.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,9 @@ func (r *streamRouteClient) Delete(ctx context.Context, obj *v1.StreamRoute) err
186186
}
187187
if err := r.cluster.cache.DeleteStreamRoute(obj); err != nil {
188188
log.Errorf("failed to reflect stream_route delete to cache: %s", err)
189-
return err
189+
if err != cache.ErrNotFound {
190+
return err
191+
}
190192
}
191193
return nil
192194
}

pkg/apisix/upstream.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,9 @@ func (u *upstreamClient) Delete(ctx context.Context, obj *v1.Upstream) error {
182182
}
183183
if err := u.cluster.cache.DeleteUpstream(obj); err != nil {
184184
log.Errorf("failed to reflect upstream delete to cache: %s", err.Error())
185-
return err
185+
if err != cache.ErrNotFound {
186+
return err
187+
}
186188
}
187189
return nil
188190
}

0 commit comments

Comments
 (0)