Skip to content

Agent Mesh

controlplane, storage: an indexable request predicate; each dropped report is traced

Antonio Ojea17e7b68c251f
diff --git a/internal/controlplane/node_gc.go b/internal/controlplane/node_gc.go
index 8056f15f..22ffd902 100644
--- a/internal/controlplane/node_gc.go
+++ b/internal/controlplane/node_gc.go
@@ -181,6 +181,7 @@ func (s *Server) pruneCatalog(now time.Time) {
for peerID := range snap {
if _, ok := keep[peerID]; !ok {
delete(s.catalog, peerID)
+ logger.Debugw("Dropped service report of a node no longer admitted", "peer_id", peerID)
dropped++
}
}
diff --git a/internal/storage/sql_store.go b/internal/storage/sql_store.go
index 498fc4e9..6ca97f52 100644
--- a/internal/storage/sql_store.go
+++ b/internal/storage/sql_store.go
@@ -1124,7 +1124,9 @@ func (s *SQLStore) DeleteSilentBootstrapNodes(ctx context.Context, before, ephem
// DeleteStaleEnrollmentRequests implements Store.
func (s *SQLStore) DeleteStaleEnrollmentRequests(ctx context.Context, before, ephemeralBefore time.Time) (int64, error) {
- res, err := s.db.ExecContext(ctx, s.rebind(`DELETE FROM enrollment_requests WHERE COALESCE(resolved_at, created_at) < ?`), before.UnixMilli())
+ // The OR form, rather than COALESCE over the two columns, lets an index
+ // on either column serve the predicate.
+ res, err := s.db.ExecContext(ctx, s.rebind(`DELETE FROM enrollment_requests WHERE resolved_at < ? OR (resolved_at IS NULL AND created_at < ?)`), before.UnixMilli(), before.UnixMilli())
if err != nil {
return 0, err
}
@@ -1132,7 +1134,7 @@ func (s *SQLStore) DeleteStaleEnrollmentRequests(ctx context.Context, before, ep
if err != nil {
return 0, err
}
- res, err = s.db.ExecContext(ctx, s.rebind(`DELETE FROM enrollment_requests WHERE COALESCE(resolved_at, created_at) < ? AND token_id IN (SELECT id FROM bootstrap_tokens WHERE ephemeral = ?)`), ephemeralBefore.UnixMilli(), true)
+ res, err = s.db.ExecContext(ctx, s.rebind(`DELETE FROM enrollment_requests WHERE (resolved_at < ? OR (resolved_at IS NULL AND created_at < ?)) AND token_id IN (SELECT id FROM bootstrap_tokens WHERE ephemeral = ?)`), ephemeralBefore.UnixMilli(), ephemeralBefore.UnixMilli(), true)
if err != nil {
return regular, err
}