Change behavior of Force Reverify: no longer executes cleanup before.
Risk: low
Visibility: medium (feature behavior change)
Signed-off-by: James Ren <jamesren@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@3226 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/scheduler/monitor_db.py b/scheduler/monitor_db.py
index 3c9948e..d2ff7a9 100755
--- a/scheduler/monitor_db.py
+++ b/scheduler/monitor_db.py
@@ -810,7 +810,7 @@
def _find_reverify(self):
- self._reverify_hosts_where("status = 'Reverify'")
+ self._reverify_hosts_where("status = 'Reverify'", cleanup=False)
def _reverify_remaining_hosts(self):
@@ -831,7 +831,8 @@
def _reverify_hosts_where(self, where,
- print_message='Reverifying host %s'):
+ print_message='Reverifying host %s',
+ cleanup=True):
full_where='locked = 0 AND invalid = 0 AND ' + where
for host in Host.fetch(where=full_where):
if self.host_has_agent(host):
@@ -839,7 +840,7 @@
continue
if print_message:
logging.info(print_message, host.hostname)
- tasks = host.reverify_tasks()
+ tasks = host.reverify_tasks(cleanup)
self.add_agent(Agent(tasks))
@@ -2240,12 +2241,13 @@
return platform, all_labels
- def reverify_tasks(self):
- cleanup_task = CleanupTask(host=self)
- verify_task = VerifyTask(host=self)
+ def reverify_tasks(self, cleanup=True):
+ tasks = [VerifyTask(host=self)]
+ if cleanup:
+ tasks.insert(0, CleanupTask(host=self))
# just to make sure this host does not get taken away
self.set_status('Cleaning')
- return [cleanup_task, verify_task]
+ return tasks
_ALPHANUM_HOST_RE = re.compile(r'^([a-z-]+)(\d+)$', re.IGNORECASE)