Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix pruning to work with safechars #320

Merged
merged 2 commits into from
Jul 9, 2024
Merged

Fix pruning to work with safechars #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1532f02
Fix pruning to work with safechars
pkonst Jul 6, 2024
2f6c410
Add tests for pruning of safe flenames
pkonst Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/core/prune.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
)

// filenameRE is a regular expression to match a backup filename
var filenameRE = regexp.MustCompile(`^db_backup_(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})Z\.\w+$`)
var filenameRE = regexp.MustCompile(`^db_backup_(\d{4})-(\d{2})-(\d{2})T(\d{2})[:-](\d{2})[:-](\d{2})Z\.\w+$`)

// Prune prune older backups
func (e *Executor) Prune(opts PruneOptions) error {
Expand Down
12 changes: 11 additions & 1 deletion pkg/core/prune_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func TestPrune(t *testing.T) {
now := time.Date(2021, 1, 1, 0, 30, 0, 0, time.UTC)
hoursAgo := []float32{0.25, 1, 2, 3, 24, 36, 48, 60, 72, 167, 168, 240, 336, 504, 576, 744, 720, 1000, 1440, 1800, 2160, 8760, 12000, 17520}
// convert to filenames
var filenames []string
var filenames, safefilenames []string
for _, h := range hoursAgo {
// convert the time diff into a duration, do not forget the negative
duration, err := time.ParseDuration(fmt.Sprintf("-%fh", h))
Expand All @@ -65,6 +65,8 @@ func TestPrune(t *testing.T) {
// convert that into the filename
filename := fmt.Sprintf("db_backup_%sZ.gz", relativeTime.Format("2006-01-02T15:04:05"))
filenames = append(filenames, filename)
safefilename := fmt.Sprintf("db_backup_%sZ.gz", relativeTime.Format("2006-01-02T15-04-05"))
safefilenames = append(safefilenames, safefilename)
}
tests := []struct {
name string
Expand All @@ -83,6 +85,14 @@ func TestPrune(t *testing.T) {
{"2 days", PruneOptions{Retention: "2d", Now: now}, filenames, filenames[0:6], nil},
// 3 weeks - file[13] is 504h+30m = 504.5h, so it should be pruned
{"3 weeks", PruneOptions{Retention: "3w", Now: now}, filenames, filenames[0:13], nil},
// repeat for safe file names
{"1 hour safe names", PruneOptions{Retention: "1h", Now: now}, safefilenames, safefilenames[0:1], nil},
// 2 hours - file[2] is 2h+30m = 2.5h, so it should be pruned
{"2 hours safe names", PruneOptions{Retention: "2h", Now: now}, safefilenames, safefilenames[0:2], nil},
// 2 days - file[6] is 48h+30m = 48.5h, so it should be pruned
{"2 days safe names", PruneOptions{Retention: "2d", Now: now}, safefilenames, safefilenames[0:6], nil},
// 3 weeks - file[13] is 504h+30m = 504.5h, so it should be pruned
{"3 weeks safe names", PruneOptions{Retention: "3w", Now: now}, safefilenames, safefilenames[0:13], nil},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down
Loading