Autotest: Stop .parse.log from being pulled back to the scheduler
Currently we are pulling .parse.log back to the scheduler after the
FinalReparseTask as part of it's cleanup.
After grepping the autotest code base and looking at monitor_db's commit
logs I have yet to find any code that actually utilizes .parse.log and
therefore am concluding it is a bug.
I've modified site_drone_manager and global_config to add another
flag/check to ensure we don't pull .parse.log unless the flag is set to
True.
BUG=chromium-os:33064
TEST=Ran existing unit tests and made sure nothing broke with my own
scheduler/drone.
Change-Id: I3b839d71dfb039b72b65fefa42c324a302518384
Reviewed-on: https://gerrit.chromium.org/gerrit/29219
Commit-Ready: Simran Basi <sbasi@google.com>
Reviewed-by: Simran Basi <sbasi@google.com>
Tested-by: Simran Basi <sbasi@google.com>
diff --git a/scheduler/site_drone_manager.py b/scheduler/site_drone_manager.py
index 53a7595..febe2b7 100644
--- a/scheduler/site_drone_manager.py
+++ b/scheduler/site_drone_manager.py
@@ -7,6 +7,7 @@
from autotest_lib.scheduler import scheduler_config
HOSTS_JOB_SUBDIR = 'hosts/'
+PARSE_LOG = '.parse.log'
class SiteDroneManager(object):
@@ -22,11 +23,19 @@
Agent Tasks (Cleanup, Verify, Repair) that reside in the hosts/
subdirectory of results if the copy_task_results_back flag has been set
to True inside global_config.ini
+
+ It will also only copy .parse.log files back to the scheduler if the
+ copy_parse_log_back flag in global_config.ini has been set to True.
"""
copy_task_results_back = global_config.global_config.get_config_value(
scheduler_config.CONFIG_SECTION, 'copy_task_results_back',
type=bool)
+ copy_parse_log_back = global_config.global_config.get_config_value(
+ scheduler_config.CONFIG_SECTION, 'copy_parse_log_back',
+ type=bool)
special_task = source_path.startswith(HOSTS_JOB_SUBDIR)
- if copy_task_results_back or not special_task:
+ parse_log = source_path.endswith(PARSE_LOG)
+ if (copy_task_results_back or not special_task) and (
+ copy_parse_log_back or not parse_log):
super(SiteDroneManager, self).copy_to_results_repository(process,
- source_path, destination_path)
\ No newline at end of file
+ source_path, destination_path)