Modified the deletion to trim backups for each specific backup target. #28
Merged
alexjurkiewicz merged 2 commits intoalexjurkiewicz:masterfrom Feb 12, 2019
Merged
Conversation
…ermine the backup type for each backup target. Also added the backup target name to the grep so the return list is limited to the specific backup target. Added a loop around the cleanup of the backups. I choose to put the existing routine inside a loop instead of adding it to the backup target loop so the call to --list-archives is only run once instead of after each backup target. Also added the backup target name to the grep so the return list is limited to the specific backup target.
Owner
|
Thanks, and congrats on your first PR! I'll take a closer look tonight, but this feature is very exciting and will fix up (imho) the biggest wart of acts. |
alexjurkiewicz
requested changes
Feb 7, 2019
Owner
alexjurkiewicz
left a comment
There was a problem hiding this comment.
Sorry for the delay. I think this is great! There are a few comments I have.
acts
Outdated
| echo "$archives" | grep -E "^$archiveprefixtodel" | while read -r archivetodel; do | ||
| log_debug "message=\"Deleting backup $archivetodel\"" | ||
| $tarsnap -d -f "$archivetodel" | ||
|
|
acts
Outdated
| archive_starttime=$(date +%s) | ||
| nicedirname=$(echo "$dir" | tr -d '/') | ||
| # Determine the archive type to create | ||
| if echo "$archives" | grep -E -q "^$hostname-yearly-$year-.+-$nicedirname"; then |
Owner
There was a problem hiding this comment.
The pattern (and all others that now have .+ in the middle should end with \$, just to be safe.
Contributor
Author
|
Thanks. Can you explain the difference between your last two comments?
Good catch on ending the grep, not sure why I missed that. I've made
the changes and added the following for your last two changes:
@@ -179,13 +179,13 @@ if [ "$backuprc" != "0" ]; then
die "acts-tarsnap-error One of the backups failed -- not deleting
old backups"
fi
-
for dir in $backuptargets; do
+ log_debug "message=\"Checking $dir for old backups to delete\""
nicedirname=$(echo "$dir" | tr -d '/')
# We don't delete any yearly backups
Do I just push the changes or do I do another PR? After this change is
complete I was thinking about making the number of backups to keep
configurable. Anything else you would like?
Scott
…On 2019-02-06 23:57, Alex Jurkiewicz wrote:
@alexjurkiewicz requested changes on this pull request.
Sorry for the delay. I think this is great! There are a few comments I
have.
-------------------------
In acts [1]:
> @@ -180,37 +179,41 @@ if [ "$backuprc" != "0" ]; then
die "acts-tarsnap-error One of the backups failed -- not deleting
old backups"
fi
-# We don't delete any yearly backups
-
-# We keep 12 monthly backups
-monthlybackups=$(echo "$archives" | grep "$hostname-monthly-" | cut
-d_ -f1 | uniq | sort -rn)
-if [ "$(echo "$monthlybackups" | wc -l)" -gt 12 ]; then
- log_debug 'message="More than 12 monthly backups, deleting the
oldest"'
- echo "$monthlybackups" | tail -n +13 | while read -r
archiveprefixtodel; do
- log_verbose "message=\"Deleting backup prefix
$archiveprefixtodel*\""
- echo "$archives" | grep -E "^$archiveprefixtodel" | while
read -r archivetodel; do
- log_debug "message=\"Deleting backup $archivetodel\""
- $tarsnap -d -f "$archivetodel"
+
extra newline
-------------------------
In acts [2]:
> @@ -161,6 +146,20 @@ backuprc=0 # Notice any failed backups
for dir in $backuptargets; do
archive_starttime=$(date +%s)
nicedirname=$(echo "$dir" | tr -d '/')
+ # Determine the archive type to create
+ if echo "$archives" | grep -E -q
"^$hostname-yearly-$year-.+-$nicedirname"; then
The pattern (and all others that now have .+ in the middle should end
with \$, just to be safe.
-------------------------
In acts [3]:
> @@ -180,37 +179,41 @@ if [ "$backuprc" != "0" ]; then
die "acts-tarsnap-error One of the backups failed -- not deleting
old backups"
fi
-# We don't delete any yearly backups
-
-# We keep 12 monthly backups
-monthlybackups=$(echo "$archives" | grep "$hostname-monthly-" | cut
-d_ -f1 | uniq | sort -rn)
-if [ "$(echo "$monthlybackups" | wc -l)" -gt 12 ]; then
- log_debug 'message="More than 12 monthly backups, deleting the
oldest"'
- echo "$monthlybackups" | tail -n +13 | while read -r
archiveprefixtodel; do
- log_verbose "message=\"Deleting backup prefix
$archiveprefixtodel*\""
- echo "$archives" | grep -E "^$archiveprefixtodel" | while
read -r archivetodel; do
- log_debug "message=\"Deleting backup $archivetodel\""
- $tarsnap -d -f "$archivetodel"
+
+for dir in $backuptargets; do
Can you add a log_debug message specifying which backup target is
being checked at the start of the loop?
-------------------------
In acts [4]:
> @@ -161,6 +146,20 @@ backuprc=0 # Notice any failed backups
for dir in $backuptargets; do
Can you add a log_debug message specifying which backup target is
being processed at the start of the loop?
--
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub [5], or mute the
thread [6].
Links:
------
[1]
#28 (comment)
[2]
#28 (comment)
[3]
#28 (comment)
[4]
#28 (comment)
[5]
#28 (review)
[6]
https://github.com/notifications/unsubscribe-auth/AtJRvTqjkjQozjyZpD8ACU3RcJQobM70ks5vK7IegaJpZM4aihl-
|
Owner
|
You can push more commits to the branch you've opened this PR from, and they will automatically show up in the PR! For future reference, please use the github UI to respond to PR reviews, you can thread the conversations that way. But it's no big deal here because the review is quite small. The only difference between the last two comments is what the log message would say. I was imagining something like: |
Added '$' to the end of the grep statements to enhance safety Removed extra blank line
Contributor
Author
|
Requested changes have been made and pushed. Thanks for clarification on the debug messages. I didn't realize it was two different loops. |
Owner
|
I think this is ready to merge! I don't currently use acts so I can't test it myself -- have you been running this for a few days? Does adding new backup paths work properly? |
Owner
|
One other thought: can you please update the README to mention that if you remove a backup target, you'll have to delete its old backups by hand? |
Owner
|
Thanks for the contribution! It's merged, and acts is now v1.4b1 |
Contributor
Author
|
Thank you. I missed your messages. I have had it running daily. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This is my first ever commit/pull request. Please let me know what I can do better.
I see that you have already moved the backup type determination to inside the backup loop. I also made the change in this request. I didn't know how to base my changes off of your changes.
I have also put a loop around the backup deletion process. It will now look at the backups that have been done per backup target. Those two deletion sections could have been pushed into the backup target loop but I choose to wrap them separately since only one --list-archive would be needed.
Thank you for the script. Its quick, simple and gets the job done. Let me know if there is anything else you would like me to take a look at.
Scott