Merge lp:~stylesen/lava-scheduler/multinode into lp:lava-scheduler/multinode

[Senthil Kumaran S]

Fix for https://bugs.launchpad.net/lava-dispatcher/+bug/1197883

[Neil Williams (codehelp)]

Looks good, approved.

review: Approve

[Senthil Kumaran S (stylesen)]

On Monday 22 July 2013 06:35 PM, Neil Williams wrote:
> Review: Approve
>
> Looks good, approved.

Even a simpler patch :)

=== modified file 'lava_scheduler_daemon/service.py'
--- lava_scheduler_daemon/service.py 2013-07-22 12:43:45 +0000
+++ lava_scheduler_daemon/service.py 2013-07-22 13:06:17 +0000
@@ -76,7 +76,7 @@
              self._cbCheckJobs).addErrback(catchall_errback(self.logger))

      def _cbCheckJobs(self, job_list):
- for job in job_list:
+ for job in set(job_list):
              new_job = NewJob(self.source, job, self.dispatcher,
self.reactor,
                               self.daemon_options)
              self.logger.info("Starting Job: %d " % job.id)

--
Senthil Kumaran
http://www.stylesen.org/
http://www.sasenthilkumaran.com/

[lp:~stylesen/lava-scheduler/multinode]

265. By Neil Williams on 2013-07-22

Senthil Kumaran 2013-07-22 Return a unique set of job_list whenever asked for.
Senthil Kumaran 2013-07-22 Get unique job ids in the job list which
 restricts the same health check job being called more than once.

=== modified file 'lava_scheduler_daemon/dbjobsource.py'
--- lava_scheduler_daemon/dbjobsource.py	2013-07-03 06:45:30 +0000
+++ lava_scheduler_daemon/dbjobsource.py	2013-07-22 12:46:28 +0000
@@ -107,10 +107,10 @@
         """Gets the list of configured boards and checks which are the boards
         that require health check.
 
-        Returns JOB_LIST which is a list of health check jobs. If no health
-        check jobs are available returns an empty list.
+        Returns JOB_LIST which is a set of health check jobs. If no health
+        check jobs are available returns an empty set.
         """
-        job_list = []
+        job_list = set()
         configured_boards = [
             x.hostname for x in dispatcher_config.get_devices()]
         boards = []
@@ -133,7 +133,7 @@
                 run_health_check = device.last_health_report_job.end_time < \
                     datetime.datetime.now() - datetime.timedelta(days=1)
             if run_health_check:
-                job_list.append(self._getHealthCheckJobForBoard(device))
+                job_list.add(self._getHealthCheckJobForBoard(device))
         return job_list
 
     def _fix_device(self, device, job):
@@ -181,7 +181,7 @@
 
         for job in jobs:
             if job.actual_device:
-                job_list.append(job)
+                job_list.add(job)
             elif job.requested_device:
                 self.logger.debug("Checking Requested Device")
                 devices = Device.objects.all().filter(
@@ -198,7 +198,7 @@
                 device = devices[0]
                 job = self._fix_device(device, job)
                 if job:
-                    job_list.append(job)
+                    job_list.add(job)
 
         return job_list