Finalize the database initialization refactoring to use the default of the container
ClosedPublic
Actions

Authored by vsellier on Nov 3 2020, 10:31 AM.

Details

Reviewers

ardumont

Group Reviewers

Reviewers

Maniphest Tasks

T2736: Configure db1 as new staging db server

Commits

rDENV0ec06a10426d: listers: let postgresql initialize the db and use the swh db init-admin command
rDENVebbf8fbf9789: vault: let postgresql initialize the db and use the swh db init-admin command
rDENV38c5cc77eb58: deposit: let postgresql initialize the db
rDENVf8fdb69b10eb: vault: let postgresql initialize the db and use the swh db init-admin command
rDENVbdb9f1b3085f: scheduler: remove PG* variable from the db configuration
rDENV1a921fc509d7: storage: let postgresql initialize the db and use the swh db init-admin command

Summary

This is the following of the refactoring initialized in T2736/D4377 with the scheduler.

The database creation is delegated to the postgresql container, and the service database is initialized via the swh db init-admin command.

I have created only one diff instead of one per service to simplify the review.

storage: let postgresql initialize the db and use the swh db init-admin command
scheduler: remove PG* variable from the db configuration
vault: let postgresql initialize the db and use the swh db init-admin command
deposit: let postgresql initialize the db
vault: let postgresql initialize the db and use the swh db init-admin command
listers: let postgresql initialize the db and use the swh db init-admin command

Test Plan

docker-compose down -v
docker-compose up

docker-compose ps

All the service must be running

Diff Detail

Repository

rDENV Development environment

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

vsellier created this revision.Nov 3 2020, 10:31 AM

Herald added a reviewer: Reviewers. · View Herald TranscriptNov 3 2020, 10:31 AM

Harbormaster completed remote builds in B16793: Diff 15564.Nov 3 2020, 10:31 AM

vsellier added a task: T2736: Configure db1 as new staging db server.Nov 3 2020, 10:32 AM

vsellier edited the summary of this revision. (Show Details)

lgtm

I'll have a look at some point to other docker-compose.*.yml, they could benefit from this as well:

docker-compose.keycloak.yml (has a pg db as well iirc)
docker-compose.storage* use probably the same old patterns

Cheers,

ardumont accepted this revision.Nov 3 2020, 11:13 AM

This revision is now accepted and ready to land.Nov 3 2020, 11:13 AM

ardumont edited the summary of this revision. (Show Details)Nov 3 2020, 11:18 AM

Thanks for validating,
I haven't changed the other docker-compose files because I didn't succeed to start them and not sure the storage part is still used.
As they are independent, we can do it in another diff without impacting the main docker-compose

Closed by commit rDENV1a921fc509d7: storage: let postgresql initialize the db and use the swh db init-admin command (authored by vsellier). · Explain WhyNov 3 2020, 12:47 PM

This revision was automatically updated to reflect the committed changes.

vsellier added a commit: rDENV1a921fc509d7: storage: let postgresql initialize the db and use the swh db init-admin command.

vsellier added a commit: rDENVbdb9f1b3085f: scheduler: remove PG* variable from the db configuration.

vsellier added a commit: rDENVf8fdb69b10eb: vault: let postgresql initialize the db and use the swh db init-admin command.

vsellier added a commit: rDENV38c5cc77eb58: deposit: let postgresql initialize the db.

vsellier added a commit: rDENVebbf8fbf9789: vault: let postgresql initialize the db and use the swh db init-admin command.

vsellier added a commit: rDENV0ec06a10426d: listers: let postgresql initialize the db and use the swh db init-admin command.