Autotest: Add logging to copy to results repo logic
We have been only using 1 drone because of the email spam sent out
regarding copying to results repo. We want to try enabling multiple
drones so that the lab will not go down in the case one drone dies.
Copy_to_results_repository is now gated by the enale_archiving flag,
meaning it should not happen.
Added logging to SSHHost's get/send file methods that drone_utility
uses to send files to the results repo. Also added logging to the
drone_utility's send/get functions as well.
BUG=chromium:231452
TEST=Local setup with multiple drones. Ensure tests still run.
Change-Id: I62a0196880d4b25ff8abb47825e280d193a4b9b7
Reviewed-on: https://chromium-review.googlesource.com/175005
Reviewed-by: Simran Basi <[email protected]>
Commit-Queue: Simran Basi <[email protected]>
Tested-by: Simran Basi <[email protected]>
diff --git a/server/hosts/abstract_ssh.py b/server/hosts/abstract_ssh.py
index 03f56d0..4120334 100644
--- a/server/hosts/abstract_ssh.py
+++ b/server/hosts/abstract_ssh.py
@@ -257,7 +257,9 @@
Raises:
AutoservRunError: the scp command failed
"""
-
+ logging.debug('get_file. source: %s, dest: %s, delete_dest: %s,'
+ 'preserve_perm: %s, preserve_symlinks:%s', source, dest,
+ delete_dest, preserve_perm, preserve_symlinks)
# Start a master SSH connection if necessary.
self.start_master_ssh()
@@ -268,6 +270,7 @@
# If rsync is disabled or fails, try scp.
try_scp = True
if self.use_rsync():
+ logging.debug('Using Rsync.')
try:
remote_source = self._encode_remote_paths(source)
local_dest = utils.sh_escape(dest)
@@ -279,6 +282,7 @@
logging.warn("trying scp, rsync failed: %s", e)
if try_scp:
+ logging.debug('Trying scp.')
# scp has no equivalent to --delete, just drop the entire dest dir
if delete_dest and os.path.isdir(dest):
shutil.rmtree(dest)
@@ -294,6 +298,7 @@
try:
utils.run(scp)
except error.CmdError, e:
+ logging.debug('scp failed: %s', e)
raise error.AutoservRunError(e.args[0], e.args[1])
if not preserve_perm:
@@ -333,7 +338,9 @@
Raises:
AutoservRunError: the scp command failed
"""
-
+ logging.debug('send_file. source: %s, dest: %s, delete_dest: %s,'
+ 'preserve_symlinks:%s', source, dest,
+ delete_dest, preserve_symlinks)
# Start a master SSH connection if necessary.
self.start_master_ssh()
@@ -344,6 +351,7 @@
# If rsync is disabled or fails, try scp.
try_scp = True
if self.use_rsync():
+ logging.debug('Using Rsync.')
try:
local_sources = [utils.sh_escape(path) for path in source]
rsync = self._make_rsync_cmd(local_sources, remote_dest,
@@ -354,6 +362,7 @@
logging.warn("trying scp, rsync failed: %s", e)
if try_scp:
+ logging.debug('Trying scp.')
# scp has no equivalent to --delete, just drop the entire dest dir
if delete_dest:
is_dir = self.run("ls -d %s/" % dest,
@@ -369,6 +378,7 @@
try:
utils.run(scp)
except error.CmdError, e:
+ logging.debug('scp failed: %s', e)
raise error.AutoservRunError(e.args[0], e.args[1])
