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

start at correct snapshot when full send

Browse Source
This commit is contained in:
Edwin Eefting 2020-02-25 18:35:35 +01:00
parent 3b2a19d492
commit ef5bca3de1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/zfs-autobackup
View File

@ -13,7 +13,6 @@ import re
import traceback import traceback
import subprocess import subprocess
import pprint import pprint
# import cStringIO
import time import time
import argparse import argparse
from pprint import pprint as p from pprint import pprint as p
@ -26,7 +25,7 @@ try:
except ImportError: except ImportError:
use_color=False use_color=False
VERSION="3.0-rc4.1" VERSION="3.0-rc4.2"
class Log: class Log:
@ -1028,7 +1027,7 @@ class ZfsDataset():
def sync_snapshots(self, target_dataset, show_progress=False, resume=True, filter_properties=[], set_properties=[], ignore_recv_exit_code=False, source_holds=True, rollback=False, raw=False, other_snapshots=False): def sync_snapshots(self, target_dataset, show_progress=False, resume=True, filter_properties=[], set_properties=[], ignore_recv_exit_code=False, source_holds=True, rollback=False, raw=False, other_snapshots=False):
"""sync this dataset's snapshots to target_dataset,""" """sync this dataset's snapshots to target_dataset, while also thinning out old snapshots along the way."""
#determine start snapshot (the first snapshot after the common snapshot) #determine start snapshot (the first snapshot after the common snapshot)
target_dataset.debug("Determining start snapshot") target_dataset.debug("Determining start snapshot")
@ -1036,6 +1035,10 @@ class ZfsDataset():
if not common_snapshot: if not common_snapshot:
#start from beginning #start from beginning
start_snapshot=self.snapshots[0] start_snapshot=self.snapshots[0]
if not start_snapshot.is_ours() and not other_snapshots:
# try to start at a snapshot thats ours
start_snapshot=self.find_next_snapshot(start_snapshot, other_snapshots)
else: else:
#roll target back to common snapshot #roll target back to common snapshot
if rollback: if rollback:
@ -1390,6 +1393,9 @@ class ZfsAutobackup:
self.log.verbose("#### "+title) self.log.verbose("#### "+title)
def run(self): def run(self):
self.verbose ("zfs-autobackup v{} - Copyright 2020 E.H.Eefting (edwin@datux.nl)\n".format(VERSION))
if self.args.test: if self.args.test:
self.verbose("TEST MODE - SIMULATING WITHOUT MAKING ANY CHANGES") self.verbose("TEST MODE - SIMULATING WITHOUT MAKING ANY CHANGES")