tests/postgresql-wal-receiver: Port to Python #96349
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dasJ
added
6.topic: testing
flokli
requested changes
Aug 26, 2020
| restore_command = 'cp ${walBackupDir}/%f %p' | ||
| ''; | ||
| pkg = pkgs."${postgresqlPackage}"; | ||
| postgresqlDataDir = "/var/db/postgresql/${lib.versions.major pkg.version}"; |
There was a problem hiding this comment.
did you forget removing this?
Comment on lines
31
to
33
| systemd.tmpfiles.rules = [ | ||
| "d /var/db/postgresql 0700 postgres postgres" | ||
| ]; |
There was a problem hiding this comment.
did you forget removing this?
| services.postgresql = { | ||
| package = pkg; | ||
| enable = true; | ||
| dataDir = postgresqlDataDir; |
There was a problem hiding this comment.
did you forget removing this?
| # stop postgres and destroy data | ||
| machine.systemctl("stop postgresql") | ||
| machine.systemctl("stop postgresql-wal-receiver-main") | ||
| machine.succeed("rm -r ${postgresqlDataDir}/{base,global,pg_*}") |
| "for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done" | ||
| ) # make use of partial segments too | ||
| machine.succeed( | ||
| "cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*" |
| $machine->succeed('cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}'); | ||
| # restore the base backup | ||
| machine.succeed( | ||
| "cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}" |
| $machine->waitForUnit('postgresql'); | ||
| # replay WAL | ||
| machine.systemctl("start postgresql") | ||
| machine.wait_for_file("${postgresqlDataDir}/recovery.done") |
... and remove some weirdnesses. - Port to Python - Drop the extra pkgs, config, system args - Drop all `with` - Don't override the standard PostgreSQL directory - Use pkgs and lib from the test runner Tested with: - postgresql_12 - postgresql_11 - postgresql_10 - postgresql_9_6 - postgresql_9_5 Closes NixOS#96347 cc @flokli
dasJ
force-pushed
the
feat/postgresql-wal-python
branch
from
29d5125
to
ead6de5
Compare
flokli
approved these changes
Aug 26, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
... and remove some weirdnesses.
withTested with:
Closes #96347
cc @flokli
Motivation for this change
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)