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

wip

Browse Source
This commit is contained in:
Edwin Eefting 2019-10-27 13:00:38 +01:00
parent 17882449e0
commit e7919489fb
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zfs_autobackup
View File

@ -778,7 +778,6 @@ class ZfsDataset():
if show_progress: if show_progress:
cmd.append("-v") cmd.append("-v")
cmd.append("-P") cmd.append("-P")
self.zfs_node.reset_progress()
#resume a previous send? (dont need more parameters in that case) #resume a previous send? (dont need more parameters in that case)
@ -831,8 +830,7 @@ class ZfsDataset():
cmd.append(self.filesystem_name) cmd.append(self.filesystem_name)
self.zfs_node.reset_progress()
self.zfs_node.run(cmd, input=pipe) self.zfs_node.run(cmd, input=pipe)
#invalidate cache, but we at least know we exist now #invalidate cache, but we at least know we exist now
@ -1016,7 +1014,7 @@ class ZfsNode(ExecuteNode):
def reset_progress(self): def reset_progress(self):
"""reset progress output counters""" """reset progress output counters"""
self._progress_total_bytes=0 self._progress_total_bytes=0
self._progress_prev_bytes=0 self._progress_start_time=time.time()
def _parse_stderr_pipe(self, line, hide_errors): def _parse_stderr_pipe(self, line, hide_errors):
"""try to parse progress output of a piped zfs recv -Pv """ """try to parse progress output of a piped zfs recv -Pv """
@ -1039,11 +1037,15 @@ class ZfsNode(ExecuteNode):
self._progress_total_bytes=int(progress_fields[3]) self._progress_total_bytes=int(progress_fields[3])
else: else:
bytes=int(progress_fields[1]) bytes=int(progress_fields[1])
percentage=0
if self._progress_total_bytes:
percentage=min(100,int(bytes*100/self._progress_total_bytes))
percentage=int(bytes*100/self._progress_total_bytes) speed=int(bytes/(time.time()-self._progress_start_time)/(1024*1024))
# print("{}% \r", end='') # print("{}% \r", end='')
print(" {}% \r".format(percentage), end='') print(">>> {}% {}MB/s ({}MB) \r".format(percentage, speed, self._progress_total_bytes/(1024*1024)), end='')
sys.stdout.flush()
return return