-
Notifications
You must be signed in to change notification settings - Fork 72
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
don't fail when chown to postgres fails #888
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d7982ec
add prepare directory tests
evgeni a248546
move chown postgres inside unless preserve
evgeni 8a00f1e
only chown to postgres group for online backups with local DB
evgeni d082fd8
don't fail when chown to postgres fails
evgeni b88981c
move the creating message into the code block doing the create
evgeni File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
109 changes: 109 additions & 0 deletions
109
test/definitions/procedures/backup/prepare_directory_test.rb
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
require 'test_helper' | ||
|
||
describe Procedures::Backup::PrepareDirectory do | ||
include DefinitionsTestHelper | ||
|
||
let(:backup_dir) { '/mnt/backup' } | ||
|
||
context 'with default params' do | ||
subject do | ||
Procedures::Backup::PrepareDirectory.new(:backup_dir => backup_dir) | ||
end | ||
|
||
it 'creates backup directory for local DB' do | ||
assume_feature_present(:instance, :postgresql_local? => true) | ||
|
||
FileUtils.expects(:mkdir_p).with(backup_dir).once | ||
FileUtils.expects(:chmod_R).with(0o770, backup_dir).once | ||
FileUtils.expects(:chown_R).with(nil, 'postgres', backup_dir).never | ||
|
||
result = run_procedure(subject) | ||
assert result.success?, 'the procedure was expected to succeed' | ||
end | ||
|
||
it 'creates backup directory for remote DB' do | ||
assume_feature_present(:instance, :postgresql_local? => false) | ||
|
||
FileUtils.expects(:mkdir_p).with(backup_dir).once | ||
FileUtils.expects(:chmod_R).with(0o770, backup_dir).once | ||
FileUtils.expects(:chown_R).with(nil, 'postgres', backup_dir).never | ||
|
||
result = run_procedure(subject) | ||
assert result.success?, 'the procedure was expected to succeed' | ||
end | ||
end | ||
|
||
context 'with online_backup=>true' do | ||
subject do | ||
Procedures::Backup::PrepareDirectory.new(:backup_dir => backup_dir, :online_backup => true) | ||
end | ||
|
||
it 'creates backup directory for local DB' do | ||
assume_feature_present(:instance, :postgresql_local? => true) | ||
|
||
FileUtils.expects(:mkdir_p).with(backup_dir).once | ||
FileUtils.expects(:chmod_R).with(0o770, backup_dir).once | ||
FileUtils.expects(:chown_R).with(nil, 'postgres', backup_dir).once | ||
|
||
result = run_procedure(subject) | ||
assert result.success?, 'the procedure was expected to succeed' | ||
end | ||
|
||
it 'does not fail when chown to postgres fails' do | ||
assume_feature_present(:instance, :postgresql_local? => true) | ||
|
||
FileUtils.expects(:mkdir_p).with(backup_dir).once | ||
FileUtils.expects(:chmod_R).with(0o770, backup_dir).once | ||
FileUtils.expects(:chown_R).with(nil, 'postgres', backup_dir).once.raises(Errno::EPERM) | ||
|
||
result = run_procedure(subject) | ||
assert result.warning?, 'the procedure was expected to warn' | ||
|
||
warn_msg = <<~MSG | ||
/mnt/backup could not be made readable by the 'postgres' user. | ||
This won't affect the backup procedure, but you have to ensure that | ||
the 'postgres' user can read the data during restore. | ||
MSG | ||
assert_equal warn_msg, result.output | ||
end | ||
|
||
it 'creates backup directory for remote DB' do | ||
assume_feature_present(:instance, :postgresql_local? => false) | ||
|
||
FileUtils.expects(:mkdir_p).with(backup_dir).once | ||
FileUtils.expects(:chmod_R).with(0o770, backup_dir).once | ||
FileUtils.expects(:chown_R).with(nil, 'postgres', backup_dir).never | ||
|
||
result = run_procedure(subject) | ||
assert result.success?, 'the procedure was expected to succeed' | ||
end | ||
end | ||
|
||
context 'with preserve_dir=>true' do | ||
subject do | ||
Procedures::Backup::PrepareDirectory.new(:backup_dir => backup_dir, :preserve_dir => true) | ||
end | ||
|
||
it 'does not create backup directory for local DB' do | ||
assume_feature_present(:instance, :postgresql_local? => true) | ||
|
||
FileUtils.expects(:mkdir_p).with(backup_dir).never | ||
FileUtils.expects(:chmod_R).with(0o770, backup_dir).never | ||
FileUtils.expects(:chown_R).with(nil, 'postgres', backup_dir).never | ||
|
||
result = run_procedure(subject) | ||
assert result.success?, 'the procedure was expected to succeed' | ||
end | ||
|
||
it 'does not create backup directory for remote DB' do | ||
assume_feature_present(:instance, :postgresql_local? => false) | ||
|
||
FileUtils.expects(:mkdir_p).with(backup_dir).never | ||
FileUtils.expects(:chmod_R).with(0o770, backup_dir).never | ||
FileUtils.expects(:chown_R).with(nil, 'postgres', backup_dir).never | ||
|
||
result = run_procedure(subject) | ||
assert result.success?, 'the procedure was expected to succeed' | ||
end | ||
end | ||
end |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be in the
else
part ofunless @preserve_dir
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe. But honestly I didn't want to touch too much of the code, just the parts that I actually wanted to change.
Also, I am not really sure why this is guarded by
if @preserve_dir
anyway.As when it's
false
, the@backup_dir
will be fresh and empty and the.glob
will just return[]
.