mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-07 05:42:50 +00:00
Revert "ssh_alt.py / decrease # of ssh roundtrips"
This reverts commit 7f8863f96d.
This commit is contained in:
Michael DeHaan
@@ -286,7 +286,7 @@ class Runner(object):
|
||||
def _execute_module(self, conn, tmp, module_name, args,
|
||||
async_jid=None, async_module=None, async_limit=None, inject=None, persist_files=False, complex_args=None):
|
||||
|
||||
''' transfer and run a module along with its arguments on the remote side'''
|
||||
''' runs a module that has already been transferred '''
|
||||
|
||||
# hack to support fireball mode
|
||||
if module_name == 'fireball':
|
||||
@@ -294,24 +294,12 @@ class Runner(object):
|
||||
if 'port' not in args:
|
||||
args += " port=%s" % C.ZEROMQ_PORT
|
||||
|
||||
(
|
||||
module_style,
|
||||
shebang,
|
||||
module_data
|
||||
) = self._configure_module(conn, module_name, args, inject, complex_args)
|
||||
|
||||
# a remote tmp path may be necessary and not already created
|
||||
if self._late_needs_tmp_path(conn, tmp, module_style):
|
||||
tmp = self._make_tmp_path(conn)
|
||||
|
||||
remote_module_path = os.path.join(tmp, module_name)
|
||||
|
||||
if not conn.has_pipelining:
|
||||
self._transfer_str(conn, tmp, module_name, module_data)
|
||||
(remote_module_path, module_style, shebang) = self._copy_module(conn, tmp, module_name, args, inject, complex_args)
|
||||
|
||||
environment_string = self._compute_environment_string(inject)
|
||||
|
||||
if tmp.find("tmp") != -1 and self.sudo and self.sudo_user != 'root':
|
||||
cmd_mod = ""
|
||||
if self.sudo and self.sudo_user != 'root':
|
||||
# deal with possible umask issues once sudo'ed to other user
|
||||
cmd_chmod = "chmod a+r %s" % remote_module_path
|
||||
self._low_level_exec_command(conn, cmd_chmod, tmp, sudoable=False)
|
||||
@@ -355,9 +343,6 @@ class Runner(object):
|
||||
if not shebang:
|
||||
raise errors.AnsibleError("module is missing interpreter line")
|
||||
|
||||
if conn.has_pipelining:
|
||||
cmd = ""
|
||||
|
||||
cmd = " ".join([environment_string.strip(), shebang.replace("#!","").strip(), cmd])
|
||||
cmd = cmd.strip()
|
||||
|
||||
@@ -372,16 +357,12 @@ class Runner(object):
|
||||
# specified in the play, not the sudo_user
|
||||
sudoable = False
|
||||
|
||||
in_data = None
|
||||
if conn.has_pipelining:
|
||||
in_data = module_data
|
||||
res = self._low_level_exec_command(conn, cmd, tmp, sudoable=sudoable)
|
||||
|
||||
res = self._low_level_exec_command(conn, cmd, tmp, sudoable=sudoable, in_data=in_data)
|
||||
|
||||
if tmp.find("tmp") != -1 and not C.DEFAULT_KEEP_REMOTE_FILES and not persist_files:
|
||||
if self.sudo and self.sudo_user != 'root':
|
||||
if self.sudo and self.sudo_user != 'root':
|
||||
# not sudoing to root, so maybe can't delete files as that other user
|
||||
# have to clean up temp files as original user in a second step
|
||||
if tmp.find("tmp") != -1 and not C.DEFAULT_KEEP_REMOTE_FILES and not persist_files:
|
||||
cmd2 = "rm -rf %s >/dev/null 2>&1" % tmp
|
||||
self._low_level_exec_command(conn, cmd2, tmp, sudoable=False)
|
||||
|
||||
@@ -689,8 +670,8 @@ class Runner(object):
|
||||
return ReturnData(host=host, comm_ok=False, result=result)
|
||||
|
||||
tmp = ''
|
||||
# action plugins may DECLARE via TRANSFERS_FILES = True that they need a remote tmp path working dir
|
||||
if self._early_needs_tmp_path(module_name, handler):
|
||||
# all modules get a tempdir, action plugins get one unless they have NEEDS_TMPPATH set to False
|
||||
if getattr(handler, 'NEEDS_TMPPATH', True):
|
||||
tmp = self._make_tmp_path(conn)
|
||||
|
||||
# render module_args and complex_args templates
|
||||
@@ -716,7 +697,7 @@ class Runner(object):
|
||||
delay = float(delay)
|
||||
time.sleep(delay)
|
||||
tmp = ''
|
||||
if self._early_needs_tmp_path(module_name, handler):
|
||||
if getattr(handler, 'NEEDS_TMPPATH', True):
|
||||
tmp = self._make_tmp_path(conn)
|
||||
result = handler.run(conn, tmp, module_name, module_args, inject, complex_args)
|
||||
result.result['attempts'] = x
|
||||
@@ -772,29 +753,9 @@ class Runner(object):
|
||||
self.callbacks.on_ok(host, data)
|
||||
return result
|
||||
|
||||
def _early_needs_tmp_path(self, module_name, handler):
|
||||
''' detect if a tmp path should be created before the handler is called '''
|
||||
if module_name in utils.plugins.action_loader:
|
||||
return getattr(handler, 'TRANSFERS_FILES', False)
|
||||
# other modules never need tmp path at early stage
|
||||
return False
|
||||
|
||||
def _late_needs_tmp_path(self, conn, tmp, module_style):
|
||||
if tmp.find("tmp") != -1:
|
||||
# tmp has already been created
|
||||
return False
|
||||
if not conn.has_pipelining:
|
||||
# tmp is necessary to store the module source code
|
||||
return True
|
||||
if module_style != "new":
|
||||
# even when conn has pipelining, old style modules need tmp to store arguments
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
# *****************************************************
|
||||
|
||||
def _low_level_exec_command(self, conn, cmd, tmp, sudoable=False, executable=None, in_data=None):
|
||||
def _low_level_exec_command(self, conn, cmd, tmp, sudoable=False, executable=None):
|
||||
''' execute a command string over SSH, return the output '''
|
||||
|
||||
if executable is None:
|
||||
@@ -807,7 +768,7 @@ class Runner(object):
|
||||
if conn.user == sudo_user:
|
||||
sudoable = False
|
||||
|
||||
rc, stdin, stdout, stderr = conn.exec_command(cmd, tmp, sudo_user, sudoable=sudoable, executable=executable, in_data=in_data)
|
||||
rc, stdin, stdout, stderr = conn.exec_command(cmd, tmp, sudo_user, sudoable=sudoable, executable=executable)
|
||||
|
||||
if type(stdout) not in [ str, unicode ]:
|
||||
out = ''.join(stdout.readlines())
|
||||
@@ -897,39 +858,27 @@ class Runner(object):
|
||||
raise errors.AnsibleError('failed to resolve remote temporary directory from %s: `%s` returned empty string' % (basetmp, cmd))
|
||||
return rc
|
||||
|
||||
|
||||
# *****************************************************
|
||||
|
||||
def _copy_module(self, conn, tmp, module_name, module_args, inject, complex_args=None):
|
||||
''' transfer a module over SFTP, does not run it '''
|
||||
(
|
||||
module_style,
|
||||
module_shebang,
|
||||
module_data
|
||||
) = self._configure_module(conn, module_name, module_args, inject, complex_args)
|
||||
module_remote_path = os.path.join(tmp, module_name)
|
||||
|
||||
self._transfer_str(conn, tmp, module_name, module_data)
|
||||
|
||||
return (module_remote_path, module_style, module_shebang)
|
||||
|
||||
# *****************************************************
|
||||
|
||||
def _configure_module(self, conn, module_name, module_args, inject, complex_args=None):
|
||||
''' find module and configure it '''
|
||||
|
||||
# Search module path(s) for named module.
|
||||
module_path = utils.plugins.module_finder.find_plugin(module_name)
|
||||
if module_path is None:
|
||||
in_path = utils.plugins.module_finder.find_plugin(module_name)
|
||||
if in_path is None:
|
||||
raise errors.AnsibleFileNotFound("module %s not found in %s" % (module_name, utils.plugins.module_finder.print_paths()))
|
||||
|
||||
out_path = os.path.join(tmp, module_name)
|
||||
|
||||
# insert shared code and arguments into the module
|
||||
(module_data, module_style, module_shebang) = module_replacer.modify_module(
|
||||
module_path, complex_args, module_args, inject
|
||||
(module_data, module_style, shebang) = module_replacer.modify_module(
|
||||
in_path, complex_args, module_args, inject
|
||||
)
|
||||
|
||||
return (module_style, module_shebang, module_data)
|
||||
self._transfer_str(conn, tmp, module_name, module_data)
|
||||
|
||||
return (out_path, module_style, shebang)
|
||||
|
||||
# *****************************************************
|
||||
|
||||
|
||||
Reference in New Issue
Block a user