feat: config_items cleanup (#591)

* feat: config_items cleanup * Update jobs/cleanup.go Co-authored-by: Moshe Immerman <[email protected]> --------- Co-authored-by: Moshe Immerman <[email protected]>
flanksource · May 29, 2024 · 39abbb9 · 39abbb9
1 parent e62f2a8
commit 39abbb9
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/jobs/cleanup.go b/jobs/cleanup.go
@@ -110,19 +110,25 @@ var CleanupConfigItems = &job.Job{
 		breakParentRelationshipQuery := fmt.Sprintf(`
 		UPDATE config_items
 		SET parent_id = NULL
-			WHERE id IN (%s) AND parent_id IS NOT NULL AND deleted_at < NOW() - interval '7 days'`,
+		WHERE id IN (%s) AND parent_id IS NOT NULL AND deleted_at < NOW() - interval '1 SECONDS' * ?`,
 			linkedConfigsQuery)
-		if tx := ctx.Context.DB().Exec(breakParentRelationshipQuery); tx.Error != nil {
+		if tx := ctx.Context.DB().Exec(breakParentRelationshipQuery, seconds); tx.Error != nil {
 			return fmt.Errorf("failed to remove config parent relationships: %w", tx.Error)
 		} else {
 			ctx.Tracef("removed %d config parent relationships", tx.RowsAffected)
 		}
 
 		configDeleteQuery := fmt.Sprintf(`
+		WITH ordered_rows AS (
+			SELECT id
+			FROM config_items
+			WHERE
+				deleted_at < NOW() - interval '1 SECONDS' * ? AND
+				id NOT IN (%s)
+			ORDER BY length(path) DESC
+		)
 		DELETE FROM config_items
-		WHERE
-			deleted_at < NOW() - interval '1 SECONDS' * ? AND
-			id NOT IN (%s)`, linkedConfigsQuery)
+		WHERE id IN (SELECT id FROM ordered_rows)`, linkedConfigsQuery)
 		for {
 			tx := ctx.Context.DB().Exec(configDeleteQuery, seconds)
 			if tx.Error != nil {