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

[Senthil Kumaran S]

Make the job based scheduler aware of health check jobs and schedule it properly.

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

256. By Neil Williams on 2013-07-01

Senthil Kumaran 2013-07-01 Make the job based scheduler aware of health check jobs and schedule it

=== modified file 'lava_scheduler_app/models.py'
--- lava_scheduler_app/models.py	2013-06-27 12:17:42 +0000
+++ lava_scheduler_app/models.py	2013-07-01 08:02:44 +0000
@@ -522,7 +522,10 @@
                 description=job_name, health_check=health_check, user=user,
                 group=group, is_public=is_public, priority=priority)
             job.save()
-            return job.id
+            if health_check == True:
+                return job
+            else:
+                return job.id
 
     def _can_admin(self, user):
         """ used to check for things like if the user can cancel or annotate

=== modified file 'lava_scheduler_daemon/dbjobsource.py'
--- lava_scheduler_daemon/dbjobsource.py	2013-06-27 11:26:26 +0000
+++ lava_scheduler_daemon/dbjobsource.py	2013-07-01 08:02:44 +0000
@@ -103,6 +103,39 @@
     def getBoardList(self):
         return self.deferForDB(self.getBoardList_impl)
 
+    def _get_health_check_jobs(self):
+        """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.
+        """
+        job_list = []
+        configured_boards = [
+            x.hostname for x in dispatcher_config.get_devices()]
+        boards = []
+        for d in Device.objects.all():
+            if d.hostname in configured_boards:
+                boards.append(d)
+
+        for device in boards:
+            if device.status != Device.IDLE:
+                continue
+            if not device.device_type.health_check_job:
+                run_health_check = False
+            elif device.health_status == Device.HEALTH_UNKNOWN:
+                run_health_check = True
+            elif device.health_status == Device.HEALTH_LOOPING:
+                run_health_check = True
+            elif not device.last_health_report_job:
+                run_health_check = True
+            else:
+                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))
+        return job_list
+
     def _fix_device(self, device, job):
         """Associate an available/idle DEVICE to the given JOB.
 
@@ -141,7 +174,7 @@
     def getJobList_impl(self):
         jobs = TestJob.objects.all().filter(
             status=TestJob.SUBMITTED).order_by('-priority', 'submit_time')
-        job_list = []
+        job_list = self._get_health_check_jobs()
         devices = None
 
         for job in jobs:
@@ -172,7 +205,10 @@
 
     def _get_json_data(self, job):
         json_data = simplejson.loads(job.definition)
-        json_data['target'] = job.actual_device.hostname
+        if job.actual_device:
+            json_data['target'] = job.actual_device.hostname
+        elif job.requested_device:
+            json_data['target'] = job.requested_device.hostname
         for action in json_data['actions']:
             if not action['command'].startswith('submit_results'):
                 continue

=== modified file 'lava_scheduler_daemon/job.py'
--- lava_scheduler_daemon/job.py	2013-06-20 11:45:50 +0000
+++ lava_scheduler_daemon/job.py	2013-07-01 08:02:44 +0000
@@ -31,7 +31,10 @@
         self.reactor = reactor
         self.daemon_options = daemon_options
         self.job = job
-        self.board_name = job.actual_device.hostname
+        if job.actual_device:
+            self.board_name = job.actual_device.hostname
+        elif job.requested_device:
+            self.board_name = job.requested_device.hostname
         if job_cls is not None:
             self.job_cls = job_cls
         self.running_job = None

=== modified file 'lava_scheduler_daemon/service.py'
--- lava_scheduler_daemon/service.py	2013-06-20 11:41:39 +0000
+++ lava_scheduler_daemon/service.py	2013-07-01 08:02:44 +0000
@@ -77,7 +77,6 @@
 
     def _cbCheckJobs(self, job_list):
         for job in job_list:
-            self.logger.debug("Found job: %d" % job.id)
             new_job = NewJob(self.source, job, self.dispatcher, self.reactor,
                              self.daemon_options)
             self.logger.info("Starting Job: %d " % job.id)