Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement chunk size argument and refactor mbuffer command generation #204

Merged
merged 2 commits into from
Oct 16, 2023
Merged

Implement chunk size argument and refactor mbuffer command generation #204

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
529c1bc
Implement chunk size argument and refactor mbuffer command generation
P-EB Jul 18, 2023
c458f82
Rename chunk-size to buffer-chunk-size
P-EB Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions zfs_autobackup/ZfsAutobackup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ def get_parser(self):
help='Limit data transfer rate in Bytes/sec (e.g. 128K. requires mbuffer.)')
group.add_argument('--buffer', metavar='SIZE', default=None,
help='Add zfs send and recv buffers to smooth out IO bursts. (e.g. 128M. requires mbuffer)')
parser.add_argument('--buffer-chunk-size', metavar="BUFFERCHUNKSIZE", default=None,
help='Tune chunk size when mbuffer is used. (requires mbuffer.)')
group.add_argument('--send-pipe', metavar="COMMAND", default=[], action='append',
help='pipe zfs send output through COMMAND (can be used multiple times)')
group.add_argument('--recv-pipe', metavar="COMMAND", default=[], action='append',
Expand Down Expand Up @@ -234,11 +236,22 @@ def get_send_pipes(self, logger):
"""determine the zfs send pipe"""

ret = []
_mbuffer = False
_buffer = "16M"
_cs = "128k"
_rate = False

# IO buffer
if self.args.buffer:
logger("zfs send buffer : {}".format(self.args.buffer))
ret.extend([ExecuteNode.PIPE, "mbuffer", "-q", "-s128k", "-m" + self.args.buffer])
_mbuffer = True
_buffer = self.args.buffer

# IO chunk size
if self.args.buffer_chunk_size:
logger("zfs send chunk size : {}".format(self.args.buffer_chunk_size))
_mbuffer = True
_cs = self.args.buffer_chunk_size

# custom pipes
for send_pipe in self.args.send_pipe:
Expand All @@ -256,7 +269,14 @@ def get_send_pipes(self, logger):
# transfer rate
if self.args.rate:
logger("zfs send transfer rate : {}".format(self.args.rate))
ret.extend([ExecuteNode.PIPE, "mbuffer", "-q", "-s128k", "-m16M", "-R" + self.args.rate])
_mbuffer = True
_rate = self.args.rate

if _mbuffer:
cmd = [ExecuteNode.PIPE, "mbuffer", "-q", "-s{}".format(_cs), "-m{}".format(_buffer)]
if _rate:
cmd.append("-R{}".format(self.args.rate))
ret.extend(cmd)

return ret

Expand All @@ -278,11 +298,19 @@ def get_recv_pipes(self, logger):
logger("zfs recv custom pipe : {}".format(recv_pipe))

# IO buffer
if self.args.buffer:
if self.args.buffer or self.args.buffer_chunk_size:
_cs = "128k"
_buffer = "16M"
# only add second buffer if its usefull. (e.g. non local transfer or other pipes active)
if self.args.ssh_source != None or self.args.ssh_target != None or self.args.recv_pipe or self.args.send_pipe or self.args.compress != None:
logger("zfs recv buffer : {}".format(self.args.buffer))
ret.extend(["mbuffer", "-q", "-s128k", "-m" + self.args.buffer, ExecuteNode.PIPE])

if self.args.buffer_chunk_size:
_cs = self.args.buffer_chunk_size
if self.args.buffer:
_buffer = self.args.buffer

ret.extend(["mbuffer", "-q", "-s{}".format(_cs), "-m{}".format(_buffer), ExecuteNode.PIPE])

return ret

Expand Down
Loading