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

ExecuteNode.py now supports running from a certain directory

Browse Source
This commit is contained in:
Edwin Eefting 2022-01-24 23:08:09 +01:00
parent 89ed1e012d
commit 02dca218b8
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_executenode.py
View File

@ -144,5 +144,23 @@ class TestExecuteNode(unittest2.TestCase):
self.pipe(nodea, nodeb) self.pipe(nodea, nodeb)
def test_cwd(self):
nodea=ExecuteNode(ssh_to="localhost", debug_output=True)
nodeb=ExecuteNode(debug_output=True)
#change to a directory with a space and execute a system pipe, check if all piped commands are executed in correct directory.
shelltest("mkdir '/tmp/space test' 2>/dev/null; true")
self.assertEqual(nodea.run(cmd=["pwd", ExecuteNode.PIPE, "cat"], cwd="/tmp/space test"), ["/tmp/space test"])
self.assertEqual(nodea.run(cmd=["cat", ExecuteNode.PIPE, "pwd"], cwd="/tmp/space test"), ["/tmp/space test"])
self.assertEqual(nodeb.run(cmd=["pwd", ExecuteNode.PIPE, "cat"], cwd="/tmp/space test"), ["/tmp/space test"])
self.assertEqual(nodeb.run(cmd=["cat", ExecuteNode.PIPE, "pwd"], cwd="/tmp/space test"), ["/tmp/space test"])
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

22
zfs_autobackup/ExecuteNode.py
View File

@ -54,15 +54,16 @@ class ExecuteNode(LogStub):
if cmd==self.PIPE: if cmd==self.PIPE:
return('|') return('|')
else: else:
return(cmd_quote(cmd)) return cmd_quote(cmd)
def _shell_cmd(self, cmd): def _shell_cmd(self, cmd, cwd):
"""prefix specified ssh shell to command and escape shell characters""" """prefix specified ssh shell to command and escape shell characters"""
ret=[] ret=[]
#add remote shell #add remote shell
if not self.is_local(): if not self.is_local():
#note: dont escape this part (executed directly without shell)
ret=["ssh"] ret=["ssh"]
if self.ssh_config is not None: if self.ssh_config is not None:
@ -70,7 +71,17 @@ class ExecuteNode(LogStub):
ret.append(self.ssh_to) ret.append(self.ssh_to)
ret.append(" ".join(map(self._quote, cmd))) #note: DO escape from here, executed in either local or remote shell.
shell_str=""
#add cwd change?
if cwd is not None:
shell_str=shell_str + "cd " + self._quote(cwd) + "; "
shell_str=shell_str + " ".join(map(self._quote, cmd))
ret.append(shell_str)
return ret return ret
@ -78,7 +89,7 @@ class ExecuteNode(LogStub):
return self.ssh_to is None return self.ssh_to is None
def run(self, cmd, inp=None, tab_split=False, valid_exitcodes=None, readonly=False, hide_errors=False, def run(self, cmd, inp=None, tab_split=False, valid_exitcodes=None, readonly=False, hide_errors=False,
return_stderr=False, pipe=False, return_all=False): return_stderr=False, pipe=False, return_all=False, cwd=None):
"""run a command on the node , checks output and parses/handle output and returns it """run a command on the node , checks output and parses/handle output and returns it
Either uses a local shell (sh -c) or remote shell (ssh) to execute the command. Either uses a local shell (sh -c) or remote shell (ssh) to execute the command.
@ -96,6 +107,7 @@ class ExecuteNode(LogStub):
:param hide_errors: don't show stderr output as error, instead show it as debugging output (use to hide expected errors) :param hide_errors: don't show stderr output as error, instead show it as debugging output (use to hide expected errors)
:param return_stderr: return both stdout and stderr as a tuple. (normally only returns stdout) :param return_stderr: return both stdout and stderr as a tuple. (normally only returns stdout)
:param return_all: return both stdout and stderr and exit_code as a tuple. (normally only returns stdout) :param return_all: return both stdout and stderr and exit_code as a tuple. (normally only returns stdout)
:param cwd: Change current working directory before executing command.
""" """
@ -132,7 +144,7 @@ class ExecuteNode(LogStub):
return True return True
# add shell command and handlers to pipe # add shell command and handlers to pipe
cmd_item=CmdItem(cmd=self._shell_cmd(cmd), readonly=readonly, stderr_handler=stderr_handler, exit_handler=exit_handler, shell=self.is_local()) cmd_item=CmdItem(cmd=self._shell_cmd(cmd, cwd), readonly=readonly, stderr_handler=stderr_handler, exit_handler=exit_handler, shell=self.is_local())
cmd_pipe.add(cmd_item) cmd_pipe.add(cmd_item)
# return pipe instead of executing? # return pipe instead of executing?