mirror of
git://git.savannah.gnu.org/guix/data-service.git
synced 2023-12-14 03:23:03 +01:00
Detach the database setup from the main guix-data-service process
This will allow restarting them independently, leaving it up to the operator to ensure that all processes are compatible.
This commit is contained in:
parent
5c9ec28cb5
commit
29d49ba31a
|
@ -25,6 +25,8 @@
|
||||||
#:export (get-database-config
|
#:export (get-database-config
|
||||||
%database-metrics-registry
|
%database-metrics-registry
|
||||||
|
|
||||||
|
run-sqitch
|
||||||
|
|
||||||
with-postgresql-connection
|
with-postgresql-connection
|
||||||
|
|
||||||
with-postgresql-connection-per-thread
|
with-postgresql-connection-per-thread
|
||||||
|
@ -110,6 +112,64 @@
|
||||||
|
|
||||||
conn))
|
conn))
|
||||||
|
|
||||||
|
(define (run-sqitch)
|
||||||
|
(with-postgresql-connection
|
||||||
|
"sqitch"
|
||||||
|
(lambda (conn)
|
||||||
|
(with-advisory-session-lock
|
||||||
|
conn
|
||||||
|
'sqitch
|
||||||
|
(lambda ()
|
||||||
|
(let ((command
|
||||||
|
(list (%config 'sqitch)
|
||||||
|
"deploy"
|
||||||
|
"--db-client" (%config 'sqitch-psql)
|
||||||
|
;; For some reason, sqitch behaves differently when the
|
||||||
|
;; guix-data-service is packaged, and when it's not, so try
|
||||||
|
;; and hack around this here.
|
||||||
|
"--chdir" (let ((base (dirname (%config 'sqitch-plan))))
|
||||||
|
(if (string-prefix? "/gnu" (%config 'sqitch-plan))
|
||||||
|
base
|
||||||
|
(dirname base)))
|
||||||
|
"--plan-file" (%config 'sqitch-plan)
|
||||||
|
"--mode" "change" ; this helps when migrations don't
|
||||||
|
; have the revert bit implemented
|
||||||
|
(let* ((database-config (get-database-config))
|
||||||
|
(params (string-join
|
||||||
|
(map
|
||||||
|
(match-lambda
|
||||||
|
((key . val)
|
||||||
|
(string-append key "=" val)))
|
||||||
|
(filter
|
||||||
|
(match-lambda
|
||||||
|
((key . _)
|
||||||
|
(not (member key '("user"
|
||||||
|
"host"
|
||||||
|
"dbname")))))
|
||||||
|
database-config))
|
||||||
|
"&")))
|
||||||
|
(string-append "db:pg://"
|
||||||
|
(assoc-ref database-config "user")
|
||||||
|
"@"
|
||||||
|
(if (string=? (assoc-ref database-config "host")
|
||||||
|
"localhost")
|
||||||
|
"" ; This means the unix socket
|
||||||
|
; connection will be used
|
||||||
|
(assoc-ref database-config "host"))
|
||||||
|
"/"
|
||||||
|
(assoc-ref database-config "dbname")
|
||||||
|
(if (string-null? params)
|
||||||
|
""
|
||||||
|
"?")
|
||||||
|
params)))))
|
||||||
|
(simple-format #t "running command: ~A\n"
|
||||||
|
(string-join command))
|
||||||
|
(unless (zero? (apply system* command))
|
||||||
|
(simple-format
|
||||||
|
(current-error-port)
|
||||||
|
"error: sqitch command failed\n")
|
||||||
|
(exit 1))))))))
|
||||||
|
|
||||||
(define* (with-postgresql-connection name f #:key (statement-timeout #f))
|
(define* (with-postgresql-connection name f #:key (statement-timeout #f))
|
||||||
(let ((conn (open-postgresql-connection name statement-timeout)))
|
(let ((conn (open-postgresql-connection name statement-timeout)))
|
||||||
(with-throw-handler
|
(with-throw-handler
|
||||||
|
|
|
@ -65,6 +65,8 @@
|
||||||
%default-options))
|
%default-options))
|
||||||
|
|
||||||
(let ((opts (parse-options (cdr (program-arguments)))))
|
(let ((opts (parse-options (cdr (program-arguments)))))
|
||||||
|
(run-sqitch)
|
||||||
|
|
||||||
(with-postgresql-connection
|
(with-postgresql-connection
|
||||||
"process-jobs"
|
"process-jobs"
|
||||||
(lambda (conn)
|
(lambda (conn)
|
||||||
|
|
|
@ -234,57 +234,9 @@
|
||||||
(simple-format port "~A\n" (getpid)))))
|
(simple-format port "~A\n" (getpid)))))
|
||||||
|
|
||||||
(when (assoc-ref opts 'update-database)
|
(when (assoc-ref opts 'update-database)
|
||||||
(let ((command
|
(run-sqitch)
|
||||||
(list (%config 'sqitch)
|
|
||||||
"deploy"
|
|
||||||
"--db-client" (%config 'sqitch-psql)
|
|
||||||
;; For some reason, sqitch behaves differently when the
|
|
||||||
;; guix-data-service is packaged, and when it's not, so try
|
|
||||||
;; and hack around this here.
|
|
||||||
"--chdir" (let ((base (dirname (%config 'sqitch-plan))))
|
|
||||||
(if (string-prefix? "/gnu" (%config 'sqitch-plan))
|
|
||||||
base
|
|
||||||
(dirname base)))
|
|
||||||
"--plan-file" (%config 'sqitch-plan)
|
|
||||||
"--mode" "change" ; this helps when migrations don't
|
|
||||||
; have the revert bit implemented
|
|
||||||
(let* ((database-config (get-database-config))
|
|
||||||
(params (string-join
|
|
||||||
(map
|
|
||||||
(match-lambda
|
|
||||||
((key . val)
|
|
||||||
(string-append key "=" val)))
|
|
||||||
(filter
|
|
||||||
(match-lambda
|
|
||||||
((key . _)
|
|
||||||
(not (member key '("user"
|
|
||||||
"host"
|
|
||||||
"dbname")))))
|
|
||||||
database-config))
|
|
||||||
"&")))
|
|
||||||
(string-append "db:pg://"
|
|
||||||
(assoc-ref database-config "user")
|
|
||||||
"@"
|
|
||||||
(if (string=? (assoc-ref database-config "host")
|
|
||||||
"localhost")
|
|
||||||
"" ; This means the unix socket
|
|
||||||
; connection will be used
|
|
||||||
(assoc-ref database-config "host"))
|
|
||||||
"/"
|
|
||||||
(assoc-ref database-config "dbname")
|
|
||||||
(if (string-null? params)
|
|
||||||
""
|
|
||||||
"?")
|
|
||||||
params)))))
|
|
||||||
(simple-format #t "running command: ~A\n"
|
|
||||||
(string-join command))
|
|
||||||
(unless (zero? (apply system* command))
|
|
||||||
(simple-format
|
|
||||||
(current-error-port)
|
|
||||||
"error: sqitch command failed\n")
|
|
||||||
(exit 1))
|
|
||||||
|
|
||||||
(atomic-box-set! startup-completed #t)))
|
(atomic-box-set! startup-completed #t))
|
||||||
|
|
||||||
(call-with-new-thread
|
(call-with-new-thread
|
||||||
(lambda ()
|
(lambda ()
|
||||||
|
|
Loading…
Reference in a new issue