third-party-mirrors/zfs_autobackup
1
0
Fork 1
mirror of https://github.com/psy0rz/zfs_autobackup.git synced 2025-04-13 22:47:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "allow other snapshots to be send as well"

Browse Source 
This reverts commit 87f6581036292d6f5fb1cae7abe21d9dd3003196.
This commit is contained in:
Edwin Eefting 2017-01-10 21:58:51 +01:00
parent 25bcffc78c
commit 8e7d8069bd
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zfs_autobackup
View File

@ -1,8 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf8 -*-
#(C) Edwin Eefting edwin@datux.nl - Released under GPL v2.
from __future__ import print_function
import os
import sys
@ -161,8 +159,6 @@ def zfs_create_snapshot(ssh_to, filesystems, snapshot):
"""get names of all snapshots for specified filesystems belonging to backup_name
if backup_name=None it will get all snapshots
return[filesystem_name]=[ "snashot1", "snapshot2", ... ]
"""
def zfs_get_snapshots(ssh_to, filesystems, backup_name):
@ -176,7 +172,7 @@ def zfs_get_snapshots(ssh_to, filesystems, backup_name):
ret={}
for snapshot in snapshots:
(filesystem, snapshot_name)=snapshot.split("@")
if not backup_name or re.match("^"+backup_name+"-[0-9]*$", snapshot_name):
if re.match("^"+backup_name+"-[0-9]*$", snapshot_name):
if not filesystem in ret:
ret[filesystem]=[]
ret[filesystem].append(snapshot_name)
@ -362,8 +358,7 @@ parser.add_argument('target_fs', help='Target filesystem')
parser.add_argument('--no-snapshot', action='store_true', help='dont create new snapshot (usefull for finishing uncompleted backups, or cleanups)')
parser.add_argument('--no-send', action='store_true', help='dont send snapshots (usefull to only do a cleanup)')
parser.add_argument('--strip-path', default=0, type=int, help='number of directories to strip from path (1 when cloning zones between 2 SmartOS machines for HA setup)')
parser.add_argument('--other-snapshots', default=0, type=int, help='send other snapshots as well, not just the ones created by zfs_autobackup.')
parser.add_argument('--strip-path', default=0, type=int, help='number of directory to strip from path (use 1 when cloning zones between 2 SmartOS machines)')
parser.add_argument('--destroy-stale', action='store_true', help='Destroy stale backups that have no more snapshots. Be sure to verify the output before using this! ')
@ -408,20 +403,15 @@ if not args.no_snapshot:
verbose("Creating source snapshot {0} on {1} ".format(new_snapshot_name, args.ssh_source))
zfs_create_snapshot(args.ssh_source, source_filesystems, new_snapshot_name)
if args.other_snapshots:
snapshot_filter=args.backup_name
else:
snapshot_filter=None
#get all snapshots of all selected filesystems on both source and target
verbose("Getting source snapshot-list from {0}".format(args.ssh_source))
source_snapshots=zfs_get_snapshots(args.ssh_source, source_filesystems, snapshot_filter)
source_snapshots=zfs_get_snapshots(args.ssh_source, source_filesystems, args.backup_name)
debug("Source snapshots: " + str(pprint.pformat(source_snapshots)))
target_snapshots={}
try:
verbose("Getting target snapshot-list from {0}".format(args.ssh_target))
target_snapshots=zfs_get_snapshots(args.ssh_target, target_filesystems, snapshot_filter)
target_snapshots=zfs_get_snapshots(args.ssh_target, target_filesystems, args.backup_name)
except subprocess.CalledProcessError:
verbose("(ignoring errors, probably initial backup for this filesystem)")
pass