Record job success without deleting the job record

Previously, the records for jobs would be deleted. It's useful to know when
jobs were inserted in to the database, as well as when they succeeded (if they
have). This change also makes it possible to keep track of jobs that have
failed, as they won't be deleted.
This commit is contained in:
Christopher Baines 2019-06-02 16:20:51 +01:00
parent f03a750705
commit 4ccf3132b6
5 changed files with 44 additions and 8 deletions

View File

@ -385,13 +385,15 @@
(simple-format
#t "Successfully loaded ~A package/derivation pairs\n"
(length package-derivation-ids))))
(length package-derivation-ids)))
#t)
(lambda (key . args)
(simple-format (current-error-port)
"Failed extracting information: ~A ~A\n"
key args)
(force-output)
(exec-query conn "ROLLBACK")))))
(exec-query conn "ROLLBACK")
#f))))
(define (load-new-guix-revision conn git-repository-id commit)
(if (guix-revision-exists? conn git-repository-id commit)
@ -440,6 +442,14 @@ RETURNING id;")
(list (number->string n)))))
result))
(define (record-job-succeeded conn id)
(exec-query
conn
(string-append
"UPDATE load_new_guix_revision_jobs WHERE id = $1 "
"SET succeeded_at = current_time")
(list id)))
(define (process-next-load-new-guix-revision-job conn)
(let ((next
(exec-query
@ -452,10 +462,7 @@ RETURNING id;")
(begin
(simple-format #t "Processing job ~A (commit: ~A, source: ~A)\n\n"
id commit source)
(load-new-guix-revision conn git-repository-id commit)
(exec-query
conn
(string-append "DELETE FROM load_new_guix_revision_jobs WHERE id = '"
id
"'"))))
(when (eq? (load-new-guix-revision conn git-repository-id commit)
#t)
(record-job-succeeded conn id))))
(_ #f))))

View File

@ -0,0 +1,12 @@
-- Deploy guix-data-service:dates_to_load_new_guix_revision_jobs to pg
-- requires: initial_import
BEGIN;
ALTER TABLE load_new_guix_revision_jobs
ADD COLUMN created_at timestamp without time zone DEFAULT clock_timestamp();
ALTER TABLE load_new_guix_revision_jobs
ADD COLUMN succeeded_at timestamp without time zone;
COMMIT;

View File

@ -0,0 +1,8 @@
-- Revert guix-data-service:dates_to_load_new_guix_revision_jobs from pg
BEGIN;
ALTER TABLE load_new_guix_revision_jobs DROP COLUMN created_at;
ALTER TABLE load_new_guix_revision_jobs DROP COLUMN succeeded_at;
COMMIT;

View File

@ -11,3 +11,4 @@ remove_package_metadata_sha1_hash 2019-05-12T10:37:40Z Christopher Baines <mail@
add_location_information 2019-05-12T20:27:48Z Christopher Baines <mail@cbaines.net> # Add locations table and location to package_metadata
add_git_repositories_cgit_url_base 2019-05-13T18:45:14Z Christopher Baines <mail@cbaines.net> # Add cgit_url_base to git_repositories
license_support 2019-05-13T20:37:40Z Christopher Baines <mail@cbaines.net> # Add support for storing license information
dates_to_load_new_guix_revision_jobs 2019-06-02T07:39:49Z Christopher Baines <mail@cbaines.net> # Add dates to the load_new_guix_revision_jobs table

View File

@ -0,0 +1,8 @@
-- Verify guix-data-service:dates_to_load_new_guix_revision_jobs on pg
BEGIN;
SELECT created_at FROM load_new_guix_revision_jobs WHERE FALSE;
SELECT succeeded_at FROM load_new_guix_revision_jobs WHERE FALSE;
ROLLBACK;