extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2024-11-29 11:55:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

pruner: handle replication cursor being older than any snapshot correctly

Browse Source
This commit is contained in:
Christian Schwarz 2018-10-12 15:29:07 +02:00
parent cb83a26c90
commit 9bb7b19c93
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
daemon/pruner/pruner.go
View File

@ -402,7 +402,17 @@ fsloop:
sort.Slice(tfsvs, func(i, j int) bool { sort.Slice(tfsvs, func(i, j int) bool {
return tfsvs[i].CreateTXG < tfsvs[j].CreateTXG return tfsvs[i].CreateTXG < tfsvs[j].CreateTXG
}) })
preCursor := true
haveCursorSnapshot := false
for _, tfsv := range tfsvs {
if tfsv.Type != pdu.FilesystemVersion_Snapshot {
continue
}
if tfsv.Guid == rc.GetGuid() {
haveCursorSnapshot = true
}
}
preCursor := haveCursorSnapshot
for _, tfsv := range tfsvs { for _, tfsv := range tfsvs {
if tfsv.Type != pdu.FilesystemVersion_Snapshot { if tfsv.Type != pdu.FilesystemVersion_Snapshot {
continue continue
@ -413,6 +423,7 @@ fsloop:
l.WithError(pfs.err).Error("") l.WithError(pfs.err).Error("")
continue fsloop continue fsloop
} }
// note that we cannot use CreateTXG because target and receiver could be on different pools
atCursor := tfsv.Guid == rc.GetGuid() atCursor := tfsv.Guid == rc.GetGuid()
preCursor = preCursor && !atCursor preCursor = preCursor && !atCursor
pfs.snaps = append(pfs.snaps, snapshot{ pfs.snaps = append(pfs.snaps, snapshot{