Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
328d1649ce | |||
5588780887 | |||
b0758a6b8b |
@ -369,9 +369,9 @@ def main():
|
|||||||
try:
|
try:
|
||||||
if remote in remote_snapshots:
|
if remote in remote_snapshots:
|
||||||
remote_snapshots[remote] = zsnaplib.get_snapshots(zfs_cmd)
|
remote_snapshots[remote] = zsnaplib.get_snapshots(zfs_cmd)
|
||||||
except zsnaplib.ZFSSnapshotError:
|
except zsnaplib.ZFSSnapshotError as e:
|
||||||
del remote_snapshots[remote]
|
del remote_snapshots[remote]
|
||||||
log.warning("Could not refresh snapshots on {}".format(remote))
|
log.warning("Could not refresh snapshots on {}: {}".format(remote, e))
|
||||||
snapshots = zsnaplib.get_snapshots(local_zfs_cmd)
|
snapshots = zsnaplib.get_snapshots(local_zfs_cmd)
|
||||||
|
|
||||||
failed_send = send_snapshots(fslist, snapshots, config)
|
failed_send = send_snapshots(fslist, snapshots, config)
|
||||||
|
@ -83,7 +83,7 @@ def get_filesystems(zfs_cmd):
|
|||||||
|
|
||||||
for row in out.splitlines():
|
for row in out.splitlines():
|
||||||
row = row.decode('UTF-8')
|
row = row.decode('UTF-8')
|
||||||
ret.add(row.split()[0])
|
ret.add(row.split('\t')[0])
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
|
||||||
@ -93,7 +93,7 @@ def get_snapshots(zfs_cmd):
|
|||||||
snapshots = {}
|
snapshots = {}
|
||||||
|
|
||||||
for row in out.splitlines():
|
for row in out.splitlines():
|
||||||
row = row.decode('UTF-8').split()[0]
|
row = row.decode('UTF-8').split('\t')[0]
|
||||||
res = re_snapshot.match(row)
|
res = re_snapshot.match(row)
|
||||||
if res:
|
if res:
|
||||||
d = datetime.datetime.strptime(res.group(2), time_format)
|
d = datetime.datetime.strptime(res.group(2), time_format)
|
||||||
|
Loading…
Reference in New Issue
Block a user