-
Notifications
You must be signed in to change notification settings - Fork 118
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix pgsql import - don't end psql import prematurely, install gzip on sles (for zcat), move sql file path to defaults #148
Open
ghormoon
wants to merge
3
commits into
saltstack-formulas:master
Choose a base branch
from
ghormoon:fix-pgsql-import
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
224b87c
to
d0df979
Compare
d0df979
to
8601e0c
Compare
I've removed the user change, it seems on completely clean VM, it won't build the SLS if it asks for zabbix user (even though it would be used after it would be created) |
8601e0c
to
db9bf8d
Compare
hatifnatt
reviewed
Apr 19, 2021
13b31b2
to
fbff3c1
Compare
I've rebased on the recent master and split off #151 so we can discuss that specific issue separartely |
fbff3c1
to
f9c6da0
Compare
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.
PR progress checklist (to be filled in by reviewers)
What type of PR is this?
Primary type
[fix]
A bug fixDoes this PR introduce a
BREAKING CHANGE
?No.
Related issues and/or pull requests
#147
Describe the changes you're proposing
head -5 after psql does end the pswl import prematurely with EPIPE, so we need to wait for the command to end.
removed for now, will be in separate pullrequest
when dbroot_user and dbroot_pass is defined, it runs psql as user nobody, which is not guaranteed to exist on all distros. i suggest using zabbix.user, which does exist as we already installed zabbix (so we can use the sql.gz file to import) resolved with the remake of the check, uses zabbix user nowinstall gzip on sles so we are sure zcat exists
move default path to sql file to defaults.yml, so it can be overriden in osfamilymap.yml and not only pillar
redone the check, so it uses psql after it is installed, similarly to what import does, not before.
Pillar / config required to test the proposed changes
remote db with dbroot_user and dbroot_pass set.
Debug log showing how the proposed changes work
removed, most relevant part moved to another pull