octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-11-02 19:49:44 +00:00
Code Issues Releases Wiki Activity

Add Hourly expire functions

Browse Source
This commit is contained in:
Alexander Neumann 2016-08-20 15:55:02 +02:00
parent 6cf4b81558
commit cbd457e557
15 changed files with 376 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/restic/snapshot_filter.go
View File

@ -57,6 +57,7 @@ func FilterSnapshots(s Snapshots, f SnapshotFilter) (result Snapshots) {
// ExpirePolicy configures which snapshots should be automatically removed. // ExpirePolicy configures which snapshots should be automatically removed.
type ExpirePolicy struct { type ExpirePolicy struct {
Last int // keep the last n snapshots Last int // keep the last n snapshots
Hourly int // keep the last n hourly snapshots
Daily int // keep the last n daily snapshots Daily int // keep the last n daily snapshots
Weekly int // keep the last n weekly snapshots Weekly int // keep the last n weekly snapshots
Monthly int // keep the last n monthly snapshots Monthly int // keep the last n monthly snapshots
@ -81,6 +82,11 @@ func (f filter) String() string {
return fmt.Sprintf("<filter %d todo, %d keep, %d remove>", len(f.Unprocessed), len(f.Keep), len(f.Remove)) return fmt.Sprintf("<filter %d todo, %d keep, %d remove>", len(f.Unprocessed), len(f.Keep), len(f.Remove))
} }
// ymdh returns an integer in the form YYYYMMDDHH.
func ymdh(d time.Time) int {
return d.Year()*1000000 + int(d.Month())*10000 + d.Day()*100 + d.Hour()
}
// ymd returns an integer in the form YYYYMMDD. // ymd returns an integer in the form YYYYMMDD.
func ymd(d time.Time) int { func ymd(d time.Time) int {
return d.Year()*10000 + int(d.Month())*100 + d.Day() return d.Year()*10000 + int(d.Month())*100 + d.Day()
@ -185,6 +191,7 @@ func ApplyPolicy(list Snapshots, p ExpirePolicy) (keep, remove Snapshots) {
} }
f.keepLast(p.Last) f.keepLast(p.Last)
f.apply(ymdh, p.Hourly)
f.apply(ymd, p.Daily) f.apply(ymd, p.Daily)
f.apply(yw, p.Weekly) f.apply(yw, p.Weekly)
f.apply(ym, p.Monthly) f.apply(ym, p.Monthly)

1
src/restic/snapshot_filter_test.go
View File

@ -194,6 +194,7 @@ var expireTests = []ExpirePolicy{
{Last: 15}, {Last: 15},
{Last: 99}, {Last: 99},
{Last: 200}, {Last: 200},
{Hourly: 20},
{Daily: 3}, {Daily: 3},
{Daily: 10}, {Daily: 10},
{Daily: 30}, {Daily: 30},

50
src/restic/testdata/expired_snapshots_10 vendored
View File

@ -8,5 +8,55 @@
"time": "2016-01-12T21:08:03+01:00", "time": "2016-01-12T21:08:03+01:00",
"tree": null, "tree": null,
"paths": null "paths": null
},
{
"time": "2016-01-12T21:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-09T21:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-08T20:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-07T10:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-06T08:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-05T09:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-04T16:23:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-03T07:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-01T07:08:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-22T10:20:30+01:00",
"tree": null,
"paths": null
} }
] ]

10
src/restic/testdata/expired_snapshots_11 vendored
View File

@ -8,15 +8,5 @@
"time": "2016-01-12T21:08:03+01:00", "time": "2016-01-12T21:08:03+01:00",
"tree": null, "tree": null,
"paths": null "paths": null
},
{
"time": "2016-01-09T21:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-03T07:02:03+01:00",
"tree": null,
"paths": null
} }
] ]

15
src/restic/testdata/expired_snapshots_12 vendored
View File

@ -14,24 +14,9 @@
"tree": null, "tree": null,
"paths": null "paths": null
}, },
{
"time": "2016-01-08T20:02:03+01:00",
"tree": null,
"paths": null
},
{ {
"time": "2016-01-03T07:02:03+01:00", "time": "2016-01-03T07:02:03+01:00",
"tree": null, "tree": null,
"paths": null "paths": null
},
{
"time": "2015-11-22T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-15T10:20:30+01:00",
"tree": null,
"paths": null
} }
] ]

37
src/restic/testdata/expired_snapshots_13 vendored
View File

@ -4,28 +4,33 @@
"tree": null, "tree": null,
"paths": null "paths": null
}, },
{
"time": "2016-01-12T21:08:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-09T21:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-08T20:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-03T07:02:03+01:00",
"tree": null,
"paths": null
},
{ {
"time": "2015-11-22T10:20:30+01:00", "time": "2015-11-22T10:20:30+01:00",
"tree": null, "tree": null,
"paths": null "paths": null
}, },
{ {
"time": "2015-10-22T11:20:30+02:00", "time": "2015-11-15T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-09-22T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-08-22T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2014-11-22T10:20:30+01:00",
"tree": null, "tree": null,
"paths": null "paths": null
} }

20
src/restic/testdata/expired_snapshots_14 vendored
View File

@ -4,21 +4,6 @@
"tree": null, "tree": null,
"paths": null "paths": null
}, },
{
"time": "2016-01-12T21:08:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-09T21:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-03T07:02:03+01:00",
"tree": null,
"paths": null
},
{ {
"time": "2015-11-22T10:20:30+01:00", "time": "2015-11-22T10:20:30+01:00",
"tree": null, "tree": null,
@ -43,10 +28,5 @@
"time": "2014-11-22T10:20:30+01:00", "time": "2014-11-22T10:20:30+01:00",
"tree": null, "tree": null,
"paths": null "paths": null
},
{
"time": "2014-10-22T11:20:30+02:00",
"tree": null,
"paths": null
} }
] ]

35
src/restic/testdata/expired_snapshots_15 vendored
View File

@ -4,14 +4,49 @@
"tree": null, "tree": null,
"paths": null "paths": null
}, },
{
"time": "2016-01-12T21:08:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-09T21:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-03T07:02:03+01:00",
"tree": null,
"paths": null
},
{ {
"time": "2015-11-22T10:20:30+01:00", "time": "2015-11-22T10:20:30+01:00",
"tree": null, "tree": null,
"paths": null "paths": null
}, },
{
"time": "2015-10-22T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-09-22T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-08-22T11:20:30+02:00",
"tree": null,
"paths": null
},
{ {
"time": "2014-11-22T10:20:30+01:00", "time": "2014-11-22T10:20:30+01:00",
"tree": null, "tree": null,
"paths": null "paths": null
},
{
"time": "2014-10-22T11:20:30+02:00",
"tree": null,
"paths": null
} }
] ]

55
src/restic/testdata/expired_snapshots_16 vendored
View File

@ -4,66 +4,11 @@
"tree": null, "tree": null,
"paths": null "paths": null
}, },
{
"time": "2016-01-12T21:08:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-09T21:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-08T20:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-07T10:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-06T08:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-05T09:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-04T16:23:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-03T07:02:03+01:00",
"tree": null,
"paths": null
},
{ {
"time": "2015-11-22T10:20:30+01:00", "time": "2015-11-22T10:20:30+01:00",
"tree": null, "tree": null,
"paths": null "paths": null
}, },
{
"time": "2015-10-22T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-09-22T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-08-22T11:20:30+02:00",
"tree": null,
"paths": null
},
{ {
"time": "2014-11-22T10:20:30+01:00", "time": "2014-11-22T10:20:30+01:00",
"tree": null, "tree": null,

72
src/restic/testdata/expired_snapshots_17 vendored Normal file
View File

@ -0,0 +1,72 @@
[
{
"time": "2016-01-18T12:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-12T21:08:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-09T21:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-08T20:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-07T10:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-06T08:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-05T09:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-04T16:23:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-03T07:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-22T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-22T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-09-22T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-08-22T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2014-11-22T10:20:30+01:00",
"tree": null,
"paths": null
}
]

85
src/restic/testdata/expired_snapshots_5 vendored
View File

@ -13,5 +13,90 @@
"time": "2016-01-09T21:02:03+01:00", "time": "2016-01-09T21:02:03+01:00",
"tree": null, "tree": null,
"paths": null "paths": null
},
{
"time": "2016-01-08T20:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-07T10:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-06T08:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-05T09:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-04T16:23:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-04T12:30:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-04T11:23:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-04T10:23:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-03T07:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-01T07:08:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-01T01:03:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-22T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-21T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-20T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-18T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-15T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-13T10:20:30+01:00",
"tree": null,
"paths": null
} }
] ]

35
src/restic/testdata/expired_snapshots_6 vendored
View File

@ -13,40 +13,5 @@
"time": "2016-01-09T21:02:03+01:00", "time": "2016-01-09T21:02:03+01:00",
"tree": null, "tree": null,
"paths": null "paths": null
},
{
"time": "2016-01-08T20:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-07T10:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-06T08:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-05T09:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-04T16:23:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-03T07:02:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2016-01-01T07:08:03+01:00",
"tree": null,
"paths": null
} }
] ]

100
src/restic/testdata/expired_snapshots_7 vendored
View File

@ -48,105 +48,5 @@
"time": "2016-01-01T07:08:03+01:00", "time": "2016-01-01T07:08:03+01:00",
"tree": null, "tree": null,
"paths": null "paths": null
},
{
"time": "2015-11-22T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-21T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-20T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-18T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-15T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-13T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-12T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-10T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-08T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-22T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-20T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-11T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-10T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-09T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-08T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-06T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-05T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-02T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-01T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-09-22T11:20:30+02:00",
"tree": null,
"paths": null
} }
] ]

110
src/restic/testdata/expired_snapshots_8 vendored
View File

@ -9,11 +9,6 @@
"tree": null, "tree": null,
"paths": null "paths": null
}, },
{
"time": "2016-01-12T21:02:03+01:00",
"tree": null,
"paths": null
},
{ {
"time": "2016-01-09T21:02:03+01:00", "time": "2016-01-09T21:02:03+01:00",
"tree": null, "tree": null,
@ -48,5 +43,110 @@
"time": "2016-01-03T07:02:03+01:00", "time": "2016-01-03T07:02:03+01:00",
"tree": null, "tree": null,
"paths": null "paths": null
},
{
"time": "2016-01-01T07:08:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-22T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-21T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-20T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-18T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-15T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-13T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-12T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-10T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-08T10:20:30+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-22T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-20T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-11T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-10T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-09T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-08T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-06T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-05T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-02T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-10-01T11:20:30+02:00",
"tree": null,
"paths": null
},
{
"time": "2015-09-22T11:20:30+02:00",
"tree": null,
"paths": null
} }
] ]

10
src/restic/testdata/expired_snapshots_9 vendored
View File

@ -48,15 +48,5 @@
"time": "2016-01-03T07:02:03+01:00", "time": "2016-01-03T07:02:03+01:00",
"tree": null, "tree": null,
"paths": null "paths": null
},
{
"time": "2016-01-01T07:08:03+01:00",
"tree": null,
"paths": null
},
{
"time": "2015-11-22T10:20:30+01:00",
"tree": null,
"paths": null
} }
] ]