diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-02-23 11:00:18 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-02-23 11:00:18 +0100 |
| commit | 1a8cfb6d4c767d6cb19689404d7d0bca336ed0d6 (patch) | |
| tree | 9e2f32e641c81450466d73b36df14ebc3f6437d4 /gnu/services | |
| parent | bebcf97600b2fa65482ae8ee870800dafa34d3f8 (diff) | |
| download | guix-patches-1a8cfb6d4c767d6cb19689404d7d0bca336ed0d6.tar guix-patches-1a8cfb6d4c767d6cb19689404d7d0bca336ed0d6.tar.gz | |
services: postgresql-roles: Fix race condition.
Make sure that the postgresql-roles script is completed before declaring the
postgresql-roles service as started.
* gnu/services/databases.scm (postgresql-create-roles): Return the command
line instead of a program-file.
(postgresql-role-shepherd-service): Use fork+exec-command to start the role
creation script and wait for its completion before returning.
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/databases.scm | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 91ce503e82..979f3dd6c8 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -410,13 +410,8 @@ rolname = '" ,name "')) as not_exists;\n" (let ((host (postgresql-role-configuration-host config)) (roles (postgresql-role-configuration-roles config))) - (program-file - "postgresql-create-roles" - #~(begin - (let ((psql #$(file-append postgresql "/bin/psql"))) - (execl psql psql "-a" - "-h" #$host - "-f" #$(roles->queries roles))))))) + #~(let ((psql #$(file-append postgresql "/bin/psql"))) + (list psql "-a" "-h" #$host "-f" #$(roles->queries roles))))) (define (postgresql-role-shepherd-service config) (match-record config <postgresql-role-configuration> @@ -425,10 +420,14 @@ rolname = '" ,name "')) as not_exists;\n" (requirement '(postgres)) (provision '(postgres-roles)) (one-shot? #t) - (start #~(make-forkexec-constructor - (list #$(postgresql-create-roles config)) - #:user "postgres" #:group "postgres" - #:log-file #$log)) + (start + #~(lambda args + (let ((pid (fork+exec-command + #$(postgresql-create-roles config) + #:user "postgres" + #:group "postgres" + #:log-file #$log))) + (zero? (cdr (waitpid pid)))))) (documentation "Create PostgreSQL roles."))))) (define postgresql-role-service-type |