Merge lp:~codehelp/lava-scheduler/1208805-extension into lp:lava-scheduler/multinode

[Neil Williams]

  The updated fix for 1208805 was incomplete - when MultiNode jobs were
  submitted, fixing the device for each entry could cause the job to
  be None.

This change is now running on multinode.validation.linaro.org and on multinode01.validation.linaro.org and jobs are running well.

2013-08-09 09:50:50,312 [DEBUG] [lava_scheduler_daemon.dbjobsource.DatabaseJobSource] Number of configured_devices: 20
2013-08-09 09:50:50,325 [DEBUG] [lava_scheduler_daemon.dbjobsource.DatabaseJobSource] Checking Requested Device Type
2013-08-09 09:50:50,332 [INFO] [lava_scheduler_daemon.dbjobsource.DatabaseJobSource] Checking multinode-black01
2013-08-09 09:50:50,432 [INFO] [lava_scheduler_daemon.dbjobsource.DatabaseJobSource] Checking multinode-black03
2013-08-09 09:50:50,470 [INFO] [lava_scheduler_daemon.dbjobsource.DatabaseJobSource] job 1496 has been assigned to another board -- rolling back
2013-08-09 09:50:50,475 [INFO] [lava_scheduler_daemon.dbjobsource.DatabaseJobSource] Checking multinode-black02
2013-08-09 09:50:50,476 [INFO] [lava_scheduler_daemon.service.JobQueue] Starting Job: 1496
2013-08-09 09:50:50,476 [DEBUG] [lava_scheduler_daemon.job.NewJob.1496] processing job
2013-08-09 09:50:50,607 [INFO] [lava_scheduler_daemon.job.NewJob.1496] starting job {'health_check': False, 'target': u'multinode-black01', 'timeout': 900, 'actions': [{'command': 'deploy_li
naro_image', 'parameters': {'image': 'http://linaro-gateway/beaglebone/beaglebone_20130625-379.img.gz'}}, {'command': 'lava_test_shell', 'parameters': {'timeout': 900, 'testdef_repos': [{'gi
t-repo': 'git://git.linaro.org/qa/test-definitions.git', 'testdef': 'ubuntu/smoke-tests-basic.yaml'}, {'git-repo': 'git://git.linaro.org/people/neilwilliams/multinode-yaml.git', 'testdef': '
singlenode03.yaml'}]}}, {'command': 'submit_results_on_host', 'parameters': {'token': 'wsrafecxtgm5g8g2xf70xd8pwmq0c6go0lgr4f7ntnoifz3wgibmxeoybz6863nhhfxtjse8ng546b6ey4kicm8tnjzk9tpb44s1nbw
q1luclb2d3nicjpp65qlcnud5', 'stream': '/anonymous/instance-manager/', 'server': u'http://<email address hidden>/RPC2/'}}], 'job_name': 'beagleblack-single-node', 'd
evice_type': 'beaglebone-black', 'logging_level': 'DEBUG'}
2013-08-09 09:50:50,608 [INFO] [lava_scheduler_daemon.board.MonitorJob] executing "setsid lava-server manage schedulermonitor lava-dispatch multinode-black01 /tmp/tmp2Ll6ch -l debug -f /srv/lava/instances/multinode/var/log/lava-scheduler.log"
M 2013-08-09 09:50:51,376 [DEBUG] [root] not cancelling

[Senthil Kumaran S (stylesen)]

Looks good.

review: Approve

=== modified file 'lava_scheduler_daemon/dbjobsource.py'
--- lava_scheduler_daemon/dbjobsource.py	2013-08-09 08:40:31 +0000
+++ lava_scheduler_daemon/dbjobsource.py	2013-08-09 14:47:26 +0000
@@ -204,7 +204,8 @@
                 for d in devices:
                     self.logger.info("Checking %s" % d.hostname)
                     if d.hostname in configured_boards:
-                       job = self._fix_device(d, job)
+                       if job:
+                           job = self._fix_device(d, job)
                        if job:
                            job_list.add(job)