norohind/zfs_autobackup
1
0
Fork 0
forked from third-party-mirrors/zfs_autobackup
Code Pull Requests Activity

create snapshots per pool. fixes #20

Browse Source
This commit is contained in:
Edwin Eefting 2020-02-23 22:25:47 +01:00
parent 93d0823c82
commit 9d5534c11e
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
bin/zfs-autobackup
View File

@ -27,7 +27,7 @@ try:
except ImportError: except ImportError:
use_color=False use_color=False
VERSION="3.0-rc3" VERSION="3.0-rc4"
class Log: class Log:
@ -528,14 +528,18 @@ class ZfsDataset():
self.force_exists=None self.force_exists=None
def split_path(self):
"""return the path elements as an array"""
return(self.name.split("/"))
def lstrip_path(self,count): def lstrip_path(self,count):
"""return name with first count components stripped""" """return name with first count components stripped"""
return("/".join(self.name.split("/")[count:])) return("/".join(self.split_path()[count:]))
def rstrip_path(self,count): def rstrip_path(self,count):
"""return name with last count components stripped""" """return name with last count components stripped"""
return("/".join(self.name.split("/")[:-count])) return("/".join(self.split_path()[:-count]))
@property @property
@ -1223,14 +1227,14 @@ class ZfsNode(ExecuteNode):
def consistent_snapshot(self, datasets, snapshot_name, allow_empty=True): def consistent_snapshot(self, datasets, snapshot_name, allow_empty=True):
"""create a consistent (atomic) snapshot of specified datasets. """create a consistent (atomic) snapshot of specified datasets, per pool.
allow_empty: Allow empty snapshots. (compared to our latest snapshot) allow_empty: Allow empty snapshots. (compared to our latest snapshot)
""" """
cmd=[ "zfs", "snapshot" ] pools={}
noop=True #collect snapshots that we want to make, per pool
for dataset in datasets: for dataset in datasets:
if not allow_empty: if not allow_empty:
if not dataset.is_changed_ours: if not dataset.is_changed_ours:
@ -1238,17 +1242,29 @@ class ZfsNode(ExecuteNode):
continue continue
snapshot=ZfsDataset(dataset.zfs_node, dataset.name+"@"+snapshot_name) snapshot=ZfsDataset(dataset.zfs_node, dataset.name+"@"+snapshot_name)
cmd.append(str(snapshot))
pool=dataset.split_path()[0]
if not pool in pools:
pools[pool]=[]
pools[pool].append(snapshot)
#add snapshot to cache (also usefull in testmode) #add snapshot to cache (also usefull in testmode)
dataset.snapshots.append(snapshot) dataset.snapshots.append(snapshot)
noop=False
if noop: if not pools:
self.verbose("No changes, not creating snapshot.") self.verbose("No changes anywhere: not creating snapshots.")
else: return
self.verbose("Creating snapshot {}".format(snapshot_name))
#create consitent snapshot per pool
for (pool_name, snapshots) in pools.items():
cmd=[ "zfs", "snapshot" ]
cmd.extend(map(lambda snapshot: str(snapshot), snapshots))
self.verbose("Creating snapshots {} in pool {}".format(snapshot_name, pool_name))
self.run(cmd, readonly=False) self.run(cmd, readonly=False)
@ -1391,7 +1407,7 @@ class ZfsAutobackup:
self.set_title("Selecting") self.set_title("Selecting")
selected_source_datasets=source_node.selected_datasets selected_source_datasets=source_node.selected_datasets
if not selected_source_datasets: if not selected_source_datasets:
self.error("No source filesystems selected, please do a 'zfs set autobackup:{0}=true' on {1}".format(self.args.backup_name, self.args.ssh_source)) self.error("No source filesystems selected, please do a 'zfs set autobackup:{0}=true' on the source datasets you want to backup.".format(self.args.backup_name))
return(255) return(255)
source_datasets=[] source_datasets=[]