feffe/zsnapper
1
0
Fork 0
Code Issues Pull Requests Projects Releases 7 Wiki Activity

ignore "snaphost already exists"-errors when creating snapshots

Browse Source
This commit is contained in:
Fredrik Eriksson 2020-12-20 08:13:09 +01:00
parent 3cbeaa887f
commit 89a19edd6d
Signed by: feffe
GPG Key ID: F4329687B0FA7F8D
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zsnaplib/__init__.py
View File

@ -6,6 +6,7 @@ import sys
time_format='%Y-%m-%d_%H%M' time_format='%Y-%m-%d_%H%M'
re_snapshot = re.compile(r'^(.*)@([0-9]{4}-[0-9]{2}-[0-9]{2}_[0-9]{4})$') re_snapshot = re.compile(r'^(.*)@([0-9]{4}-[0-9]{2}-[0-9]{2}_[0-9]{4})$')
re_err_ok = re.compile(r"cannot create snapshot '[^']+': dataset already exists")
logger = 'zsnapper' logger = 'zsnapper'
class ZFSSnapshotError(Exception): class ZFSSnapshotError(Exception):
@ -33,7 +34,12 @@ def do_zfs_command(args, zfs_cmd, pipecmd=None):
(out, err) = ctrl_proc.communicate() (out, err) = ctrl_proc.communicate()
if ctrl_proc.returncode != 0: # check if we try to create a snapshot that already exists. This can happen
# if the script is run every minute and it takes more time than that to
# create all snapshots
if ctrl_proc.returncode == 1 && re_match(re_err_ok, err):
pass
elif ctrl_proc.returncode != 0:
raise ZFSSnapshotError('Failed to execute {}: {}'.format(cmd, err)) raise ZFSSnapshotError('Failed to execute {}: {}'.format(cmd, err))
return out return out