third-party-mirrors/zfs_autobackup
1
0
Fork 1
mirror of https://github.com/psy0rz/zfs_autobackup.git synced 2025-06-01 01:20:58 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Edwin Eefting 2024-10-11 16:09:59 +02:00
parent 4fbcc87558
commit 3919fe04a9
No known key found for this signature in database
GPG Key ID: 0F3C35D8E9887737
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_externalfailures.py
View File

@ -158,7 +158,7 @@ test_target1/test_source2/fs2/sub@test-20101111000000
# --test try again, should abort old resume # --test try again, should abort old resume
with mocktime("20101111000002"): with mocktime("20101111000002"):
self.assertFalse(ZfsAutobackup("test test_target1 --no-progress --verbose --test".split(" ")).run()) self.assertFalse(ZfsAutobackup("test test_target1 --no-progress --verbose --test --debug".split(" ")).run())
# try again, should abort old resume # try again, should abort old resume
with mocktime("20101111000002"): with mocktime("20101111000002"):

7
zfs_autobackup/ZfsDataset.py
View File

@ -692,7 +692,8 @@ class ZfsDataset:
def bookmark(self, tag): def bookmark(self, tag):
"""Bookmark this snapshot, and return the bookmark. If the bookmark already exist, it returns it.""" """Bookmark this snapshot, and return the bookmark. If the bookmark already exist, it returns it."""
# NOTE: we use the tag to add the target_path GUID, so that we can have multiple bookmarks for the same snapshot, but for different target. This is to make sure you can send a backup to two locations, without them interfering with eachothers bookmarks. # NOTE: we use the tag to add the target_path GUID, so that we can have multiple bookmarks for the same snapshot, but for different targets.
# This is to make sure you can send a backup to two locations, without them interfering with eachothers bookmarks.
if not self.is_snapshot: if not self.is_snapshot:
raise (Exception("Can only bookmark a snapshot!")) raise (Exception("Can only bookmark a snapshot!"))
@ -700,7 +701,7 @@ class ZfsDataset:
bookmark_name = self.prefix + "#" + self.tagless_suffix + self.zfs_node.tag_seperator + tag bookmark_name = self.prefix + "#" + self.tagless_suffix + self.zfs_node.tag_seperator + tag
# does this exact bookmark (including tag) already exists? # does this exact bookmark (including tag) already exists?
existing_bookmark = self.find_exact_bookmark(bookmark_name) existing_bookmark = self.parent.find_exact_bookmark(bookmark_name)
if existing_bookmark is not None: if existing_bookmark is not None:
return existing_bookmark return existing_bookmark
@ -1423,7 +1424,9 @@ class ZfsDataset:
# FIXME: met bookmarks kan de huidige snapshot na send ook meteen weg # FIXME: met bookmarks kan de huidige snapshot na send ook meteen weg
# FIXME: klopt niet, nu haalt ie altijd bookmark weg? wat als we naar andere target willen senden (zoals in test_encryption.py) # FIXME: klopt niet, nu haalt ie altijd bookmark weg? wat als we naar andere target willen senden (zoals in test_encryption.py)
if prev_source_snapshot_bookmark and ( if prev_source_snapshot_bookmark and (
# its an obsolete snapshot?
prev_source_snapshot_bookmark in source_obsoletes or ( prev_source_snapshot_bookmark in source_obsoletes or (
# its our bookmark?
prev_source_snapshot_bookmark.is_bookmark and prev_source_snapshot_bookmark.tag == bookmark_tag)): prev_source_snapshot_bookmark.is_bookmark and prev_source_snapshot_bookmark.tag == bookmark_tag)):
prev_source_snapshot_bookmark.destroy() prev_source_snapshot_bookmark.destroy()