cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve data deletion

Browse source
This commit is contained in:
Christopher Baines 2023-07-01 12:01:13 +01:00
parent 044a905c1d
commit 742949cc97
1 changed files with 66 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

36
guix-data-service/data-deletion.scm
View file

@ -205,6 +205,8 @@ WHERE id IN (
commits) commits)
", ")))) ", "))))
(catch 'psql-query-error
(lambda ()
(with-postgresql-transaction (with-postgresql-transaction
conn conn
(lambda (conn) (lambda (conn)
@ -229,6 +231,13 @@ DROP TABLE IF EXISTS package_derivations_by_guix_revision_range_git_branch_"
(number->string git-branch-id) ";"))) (number->string git-branch-id) ";")))
(delete-guix-revisions conn git-repository-id commits)))) (delete-guix-revisions conn git-repository-id commits))))
(lambda (key . args)
(simple-format
(current-error-port)
"error when attempting to delete revisions from branch: ~A ~A\n"
key args)
(apply throw key args))))
(define (delete-data-for-branch conn git-repository-id branch-name) (define (delete-data-for-branch conn git-repository-id branch-name)
(define commits (define commits
@ -557,24 +566,24 @@ WHERE NOT EXISTS (
) LIMIT $1" ) LIMIT $1"
(list (number->string batch-size)))))) (list (number->string batch-size))))))
(derivations-count (length derivations))) (derivations-count (length derivations)))
(let ((deleted-count (let ((deleted-count 0))
(with-time-logging (with-time-logging
(simple-format #f (simple-format #f
"Looking at ~A derivations" "Looking at ~A derivations"
derivations-count) derivations-count)
(fold (n-par-for-each
(lambda (count result) 8
(+ result count))
0
(map
(lambda (derivation-id) (lambda (derivation-id)
(unless (string->number derivation-id) (unless (string->number derivation-id)
(error (error
(simple-format #f "derivation-id: ~A is not a number" (simple-format #f "derivation-id: ~A is not a number"
derivation-id))) derivation-id)))
(let ((val
(with-thread-postgresql-connection (with-thread-postgresql-connection
(lambda (conn) (lambda (conn)
(catch 'psql-query-error
(lambda ()
(with-postgresql-transaction (with-postgresql-transaction
conn conn
(lambda (conn) (lambda (conn)
@ -586,8 +595,19 @@ SET CONSTRAINTS derivations_by_output_details_set_derivation_id_fkey DEFERRED")
(exec-query conn "SET LOCAL lock_timeout = '5s';") (exec-query conn "SET LOCAL lock_timeout = '5s';")
(maybe-delete-derivation conn (maybe-delete-derivation conn
derivation-id)))))) derivation-id))))
derivations))))) (lambda (key . args)
(simple-format
(current-error-port)
"error when attempting to delete derivation: ~A ~A\n"
key args)
0))))))
(monitor
(set! deleted-count
(+ val deleted-count)))))
derivations))
(simple-format (current-error-port) (simple-format (current-error-port)
"Deleted ~A derivations\n" "Deleted ~A derivations\n"
deleted-count) deleted-count)