1
=== modified file 'lava_scheduler_app/api.py'
2
--- lava_scheduler_app/api.py	2013-07-17 12:20:25 +0000
3
+++ lava_scheduler_app/api.py	2013-08-28 13:47:23 +0000
4
@@ -2,10 +2,12 @@
5
2
from simplejson import JSONDecodeError
2
from simplejson import JSONDecodeError
6
3
from django.db.models import Count
3
from django.db.models import Count
7
4
from linaro_django_xmlrpc.models import ExposedAPI
4
from linaro_django_xmlrpc.models import ExposedAPI
8
5
from lava_scheduler_app import utils
9
5
from lava_scheduler_app.models import (
6
from lava_scheduler_app.models import (
10
6
    Device,
7
    Device,
11
7
    DeviceType,
8
    DeviceType,
12
8
    JSONDataError,
9
    JSONDataError,
13
10
    DevicesUnavailableException,
14
9
    TestJob,
11
    TestJob,
15
10
)
12
)
16
11
from lava_scheduler_app.views import (
13
from lava_scheduler_app.views import (
17
@@ -35,14 +37,22 @@
18
35
            raise xmlrpclib.Fault(404, "Specified device not found.")
37
            raise xmlrpclib.Fault(404, "Specified device not found.")
19
36
        except DeviceType.DoesNotExist:
38
        except DeviceType.DoesNotExist:
20
37
            raise xmlrpclib.Fault(404, "Specified device type not found.")
39
            raise xmlrpclib.Fault(404, "Specified device type not found.")
22
38
        return job.id
40
        except DevicesUnavailableException as e:
23
41
            raise xmlrpclib.Fault(400, str(e))
24
42
        if isinstance(job, type(list())):
25
43
            return job
26
44
        else:
27
45
            return job.id
28
39
46
29
40
    def resubmit_job(self, job_id):
47
    def resubmit_job(self, job_id):
30
41
        try:
48
        try:
31
42
            job = TestJob.objects.accessible_by_principal(self.user).get(pk=job_id)
49
            job = TestJob.objects.accessible_by_principal(self.user).get(pk=job_id)
32
43
        except TestJob.DoesNotExist:
50
        except TestJob.DoesNotExist:
33
44
            raise xmlrpclib.Fault(404, "Specified job not found.")
51
            raise xmlrpclib.Fault(404, "Specified job not found.")
35
45
        return self.submit_job(job.definition)
52
        if job.is_multinode:
36
53
            return self.submit_job(job.multinode_definition)
37
54
        else:
38
55
            return self.submit_job(job.definition)
39
46
56
40
47
    def cancel_job(self, job_id):
57
    def cancel_job(self, job_id):
41
48
        if not self.user:
58
        if not self.user:
42
@@ -50,7 +60,13 @@
43
50
        job = TestJob.objects.get(pk=job_id)
60
        job = TestJob.objects.get(pk=job_id)
44
51
        if not job.can_cancel(self.user):
61
        if not job.can_cancel(self.user):
45
52
            raise xmlrpclib.Fault(403, "Permission denied.")
62
            raise xmlrpclib.Fault(403, "Permission denied.")
47
53
        job.cancel()
63
        if job.is_multinode:
48
64
            multinode_jobs = TestJob.objects.all().filter(
49
65
                target_group=job.target_group)
50
66
            for multinode_job in multinode_jobs:
51
67
                multinode_job.cancel()
52
68
        else:
53
69
            job.cancel()
54
54
        return True
70
        return True
55
55
71
56
56
    def job_output(self, job_id):
72
    def job_output(self, job_id):
57
57
73
58
=== modified file 'lava_scheduler_app/management/commands/scheduler.py'
59
--- lava_scheduler_app/management/commands/scheduler.py	2013-07-17 12:20:25 +0000
60
+++ lava_scheduler_app/management/commands/scheduler.py	2013-08-28 13:47:23 +0000
61
@@ -43,7 +43,7 @@
62
43
43
63
44
        from twisted.internet import reactor
44
        from twisted.internet import reactor
64
45
45
66
46
        from lava_scheduler_daemon.service import BoardSet
46
        from lava_scheduler_daemon.service import JobQueue
67
47
        from lava_scheduler_daemon.dbjobsource import DatabaseJobSource
47
        from lava_scheduler_daemon.dbjobsource import DatabaseJobSource
68
48
48
69
49
        daemon_options = self._configure(options)
49
        daemon_options = self._configure(options)
70
@@ -58,7 +58,7 @@
71
58
                'fake-dispatcher')
58
                'fake-dispatcher')
72
59
        else:
59
        else:
73
60
            dispatcher = options['dispatcher']
60
            dispatcher = options['dispatcher']
75
61
        service = BoardSet(
61
        service = JobQueue(
76
62
            source, dispatcher, reactor, daemon_options=daemon_options)
62
            source, dispatcher, reactor, daemon_options=daemon_options)
77
63
        reactor.callWhenRunning(service.startService)
63
        reactor.callWhenRunning(service.startService)
78
64
        reactor.run()
64
        reactor.run()
79
65
65
80
=== modified file 'lava_scheduler_app/management/commands/schedulermonitor.py'
81
--- lava_scheduler_app/management/commands/schedulermonitor.py	2012-12-03 05:03:38 +0000
82
+++ lava_scheduler_app/management/commands/schedulermonitor.py	2013-08-28 13:47:23 +0000
83
@@ -31,7 +31,7 @@
84
31
31
85
32
    def handle(self, *args, **options):
32
    def handle(self, *args, **options):
86
33
        from twisted.internet import reactor
33
        from twisted.internet import reactor
88
34
        from lava_scheduler_daemon.board import Job
34
        from lava_scheduler_daemon.job import Job
89
35
        daemon_options = self._configure(options)
35
        daemon_options = self._configure(options)
90
36
        source = DatabaseJobSource()
36
        source = DatabaseJobSource()
91
37
        dispatcher, board_name, json_file = args
37
        dispatcher, board_name, json_file = args
92
38
38
93
=== added file 'lava_scheduler_app/migrations/0030_auto__add_field_testjob_sub_id__add_field_testjob_target_group.py'
94
--- lava_scheduler_app/migrations/0030_auto__add_field_testjob_sub_id__add_field_testjob_target_group.py	1970-01-01 00:00:00 +0000
95
+++ lava_scheduler_app/migrations/0030_auto__add_field_testjob_sub_id__add_field_testjob_target_group.py	2013-08-28 13:47:23 +0000
96
@@ -0,0 +1,165 @@
97
1
# -*- coding: utf-8 -*-
98
2
from south.db import db
99
3
from south.v2 import SchemaMigration
100
4
101
5
102
6
class Migration(SchemaMigration):
103
7
104
8
    def forwards(self, orm):
105
9
        # Adding field 'TestJob.sub_id'
106
10
        db.add_column('lava_scheduler_app_testjob', 'sub_id',
107
11
                      self.gf('django.db.models.fields.CharField')(default='', max_length=200, blank=True),
108
12
                      keep_default=False)
109
13
110
14
        # Adding field 'TestJob.target_group'
111
15
        db.add_column('lava_scheduler_app_testjob', 'target_group',
112
16
                      self.gf('django.db.models.fields.CharField')(default=None, max_length=64, null=True, blank=True),
113
17
                      keep_default=False)
114
18
115
19
    def backwards(self, orm):
116
20
        # Deleting field 'TestJob.sub_id'
117
21
        db.delete_column('lava_scheduler_app_testjob', 'sub_id')
118
22
119
23
        # Deleting field 'TestJob.target_group'
120
24
        db.delete_column('lava_scheduler_app_testjob', 'target_group')
121
25
122
26
    models = {
123
27
        'auth.group': {
124
28
            'Meta': {'object_name': 'Group'},
125
29
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
126
30
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
127
31
            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
128
32
        },
129
33
        'auth.permission': {
130
34
            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
131
35
            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
132
36
            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
133
37
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
134
38
            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
135
39
        },
136
40
        'auth.user': {
137
41
            'Meta': {'object_name': 'User'},
138
42
            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
139
43
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
140
44
            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
141
45
            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
142
46
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
143
47
            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
144
48
            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
145
49
            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
146
50
            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
147
51
            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
148
52
            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
149
53
            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
150
54
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
151
55
        },
152
56
        'contenttypes.contenttype': {
153
57
            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
154
58
            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
155
59
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
156
60
            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
157
61
            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
158
62
        },
159
63
        'dashboard_app.bundle': {
160
64
            'Meta': {'ordering': "['-uploaded_on']", 'object_name': 'Bundle'},
161
65
            '_gz_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'gz_content'"}),
162
66
            '_raw_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'content'"}),
163
67
            'bundle_stream': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bundles'", 'to': "orm['dashboard_app.BundleStream']"}),
164
68
            'content_filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
165
69
            'content_sha1': ('django.db.models.fields.CharField', [], {'max_length': '40', 'unique': 'True', 'null': 'True'}),
166
70
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
167
71
            'is_deserialized': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
168
72
            'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'uploaded_bundles'", 'null': 'True', 'to': "orm['auth.User']"}),
169
73
            'uploaded_on': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
170
74
        },
171
75
        'dashboard_app.bundlestream': {
172
76
            'Meta': {'object_name': 'BundleStream'},
173
77
            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}),
174
78
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
175
79
            'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
176
80
            'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
177
81
            'name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
178
82
            'pathname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
179
83
            'slug': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
180
84
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'})
181
85
        },
182
86
        'lava_scheduler_app.device': {
183
87
            'Meta': {'object_name': 'Device'},
184
88
            'current_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['lava_scheduler_app.TestJob']", 'blank': 'True', 'unique': 'True'}),
185
89
            'device_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lava_scheduler_app.DeviceType']"}),
186
90
            'device_version': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '200', 'null': 'True', 'blank': 'True'}),
187
91
            'health_status': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
188
92
            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '200', 'primary_key': 'True'}),
189
93
            'last_health_report_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['lava_scheduler_app.TestJob']", 'blank': 'True', 'unique': 'True'}),
190
94
            'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
191
95
            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['lava_scheduler_app.Tag']", 'symmetrical': 'False', 'blank': 'True'})
192
96
        },
193
97
        'lava_scheduler_app.devicestatetransition': {
194
98
            'Meta': {'object_name': 'DeviceStateTransition'},
195
99
            'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}),
196
100
            'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
197
101
            'device': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'transitions'", 'to': "orm['lava_scheduler_app.Device']"}),
198
102
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
199
103
            'job': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lava_scheduler_app.TestJob']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}),
200
104
            'message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
201
105
            'new_state': ('django.db.models.fields.IntegerField', [], {}),
202
106
            'old_state': ('django.db.models.fields.IntegerField', [], {})
203
107
        },
204
108
        'lava_scheduler_app.devicetype': {
205
109
            'Meta': {'object_name': 'DeviceType'},
206
110
            'display': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
207
111
            'health_check_job': ('django.db.models.fields.TextField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
208
112
            'name': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'primary_key': 'True'})
209
113
        },
210
114
        'lava_scheduler_app.jobfailuretag': {
211
115
            'Meta': {'object_name': 'JobFailureTag'},
212
116
            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
213
117
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
214
118
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'})
215
119
        },
216
120
        'lava_scheduler_app.tag': {
217
121
            'Meta': {'object_name': 'Tag'},
218
122
            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
219
123
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
220
124
            'name': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'})
221
125
        },
222
126
        'lava_scheduler_app.testjob': {
223
127
            'Meta': {'object_name': 'TestJob'},
224
128
            '_results_bundle': ('django.db.models.fields.related.OneToOneField', [], {'null': 'True', 'db_column': "'results_bundle_id'", 'on_delete': 'models.SET_NULL', 'to': "orm['dashboard_app.Bundle']", 'blank': 'True', 'unique': 'True'}),
225
129
            '_results_link': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '400', 'null': 'True', 'db_column': "'results_link'", 'blank': 'True'}),
226
130
            'actual_device': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['lava_scheduler_app.Device']"}),
227
131
            'definition': ('django.db.models.fields.TextField', [], {}),
228
132
            'description': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '200', 'null': 'True', 'blank': 'True'}),
229
133
            'end_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
230
134
            'failure_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
231
135
            'failure_tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'failure_tags'", 'blank': 'True', 'to': "orm['lava_scheduler_app.JobFailureTag']"}),
232
136
            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}),
233
137
            'health_check': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
234
138
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
235
139
            'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
236
140
            'log_file': ('django.db.models.fields.files.FileField', [], {'default': 'None', 'max_length': '100', 'null': 'True', 'blank': 'True'}),
237
141
            'priority': ('django.db.models.fields.IntegerField', [], {'default': '50'}),
238
142
            'requested_device': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['lava_scheduler_app.Device']"}),
239
143
            'requested_device_type': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['lava_scheduler_app.DeviceType']"}),
240
144
            'start_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
241
145
            'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
242
146
            'sub_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
243
147
            'submit_time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
244
148
            'submit_token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['linaro_django_xmlrpc.AuthToken']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}),
245
149
            'submitter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}),
246
150
            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['lava_scheduler_app.Tag']", 'symmetrical': 'False', 'blank': 'True'}),
247
151
            'target_group': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '64', 'null': 'True', 'blank': 'True'}),
248
152
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'})
249
153
        },
250
154
        'linaro_django_xmlrpc.authtoken': {
251
155
            'Meta': {'object_name': 'AuthToken'},
252
156
            'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
253
157
            'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
254
158
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
255
159
            'last_used_on': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
256
160
            'secret': ('django.db.models.fields.CharField', [], {'default': "'7rf4239t35kqjrcixn4srgw00r61ncuq51jna0d6xbwpg2ur2annw5y1gkr9yt6ys9gh06b3wtcum4j0f2pdn5crul72mu1e1tw4at9jfgwk18asogkgoqcbc20ftylx'", 'unique': 'True', 'max_length': '128'}),
257
161
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_tokens'", 'to': "orm['auth.User']"})
258
162
        }
259
163
    }
260
164
261
165
    complete_apps = ['lava_scheduler_app']
262
0
166
263
=== added file 'lava_scheduler_app/migrations/0031_auto__add_field_testjob_multinode_definition.py'
264
--- lava_scheduler_app/migrations/0031_auto__add_field_testjob_multinode_definition.py	1970-01-01 00:00:00 +0000
265
+++ lava_scheduler_app/migrations/0031_auto__add_field_testjob_multinode_definition.py	2013-08-28 13:47:23 +0000
266
@@ -0,0 +1,162 @@
267
1
# -*- coding: utf-8 -*-
268
2
import datetime
269
3
from south.db import db
270
4
from south.v2 import SchemaMigration
271
5
from django.db import models
272
6
273
7
274
8
class Migration(SchemaMigration):
275
9
276
10
    def forwards(self, orm):
277
11
        # Adding field 'TestJob.multinode_definition'
278
12
        db.add_column('lava_scheduler_app_testjob', 'multinode_definition',
279
13
                      self.gf('django.db.models.fields.TextField')(default='', blank=True),
280
14
                      keep_default=False)
281
15
282
16
283
17
    def backwards(self, orm):
284
18
        # Deleting field 'TestJob.multinode_definition'
285
19
        db.delete_column('lava_scheduler_app_testjob', 'multinode_definition')
286
20
287
21
288
22
    models = {
289
23
        'auth.group': {
290
24
            'Meta': {'object_name': 'Group'},
291
25
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
292
26
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
293
27
            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
294
28
        },
295
29
        'auth.permission': {
296
30
            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
297
31
            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
298
32
            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
299
33
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
300
34
            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
301
35
        },
302
36
        'auth.user': {
303
37
            'Meta': {'object_name': 'User'},
304
38
            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
305
39
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
306
40
            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
307
41
            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
308
42
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
309
43
            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
310
44
            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
311
45
            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
312
46
            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
313
47
            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
314
48
            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
315
49
            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
316
50
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
317
51
        },
318
52
        'contenttypes.contenttype': {
319
53
            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
320
54
            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
321
55
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
322
56
            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
323
57
            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
324
58
        },
325
59
        'dashboard_app.bundle': {
326
60
            'Meta': {'ordering': "['-uploaded_on']", 'object_name': 'Bundle'},
327
61
            '_gz_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'gz_content'"}),
328
62
            '_raw_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'content'"}),
329
63
            'bundle_stream': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bundles'", 'to': "orm['dashboard_app.BundleStream']"}),
330
64
            'content_filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
331
65
            'content_sha1': ('django.db.models.fields.CharField', [], {'max_length': '40', 'unique': 'True', 'null': 'True'}),
332
66
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
333
67
            'is_deserialized': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
334
68
            'uploaded_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'uploaded_bundles'", 'null': 'True', 'to': "orm['auth.User']"}),
335
69
            'uploaded_on': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
336
70
        },
337
71
        'dashboard_app.bundlestream': {
338
72
            'Meta': {'object_name': 'BundleStream'},
339
73
            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}),
340
74
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
341
75
            'is_anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
342
76
            'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
343
77
            'name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
344
78
            'pathname': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
345
79
            'slug': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
346
80
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'})
347
81
        },
348
82
        'lava_scheduler_app.device': {
349
83
            'Meta': {'object_name': 'Device'},
350
84
            'current_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['lava_scheduler_app.TestJob']", 'blank': 'True', 'unique': 'True'}),
351
85
            'device_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lava_scheduler_app.DeviceType']"}),
352
86
            'device_version': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '200', 'null': 'True', 'blank': 'True'}),
353
87
            'health_status': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
354
88
            'hostname': ('django.db.models.fields.CharField', [], {'max_length': '200', 'primary_key': 'True'}),
355
89
            'last_health_report_job': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['lava_scheduler_app.TestJob']", 'blank': 'True', 'unique': 'True'}),
356
90
            'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
357
91
            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['lava_scheduler_app.Tag']", 'symmetrical': 'False', 'blank': 'True'})
358
92
        },
359
93
        'lava_scheduler_app.devicestatetransition': {
360
94
            'Meta': {'object_name': 'DeviceStateTransition'},
361
95
            'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}),
362
96
            'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
363
97
            'device': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'transitions'", 'to': "orm['lava_scheduler_app.Device']"}),
364
98
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
365
99
            'job': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['lava_scheduler_app.TestJob']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}),
366
100
            'message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
367
101
            'new_state': ('django.db.models.fields.IntegerField', [], {}),
368
102
            'old_state': ('django.db.models.fields.IntegerField', [], {})
369
103
        },
370
104
        'lava_scheduler_app.devicetype': {
371
105
            'Meta': {'object_name': 'DeviceType'},
372
106
            'display': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
373
107
            'health_check_job': ('django.db.models.fields.TextField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
374
108
            'name': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'primary_key': 'True'})
375
109
        },
376
110
        'lava_scheduler_app.jobfailuretag': {
377
111
            'Meta': {'object_name': 'JobFailureTag'},
378
112
            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
379
113
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
380
114
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'})
381
115
        },
382
116
        'lava_scheduler_app.tag': {
383
117
            'Meta': {'object_name': 'Tag'},
384
118
            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
385
119
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
386
120
            'name': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'})
387
121
        },
388
122
        'lava_scheduler_app.testjob': {
389
123
            'Meta': {'object_name': 'TestJob'},
390
124
            '_results_bundle': ('django.db.models.fields.related.OneToOneField', [], {'null': 'True', 'db_column': "'results_bundle_id'", 'on_delete': 'models.SET_NULL', 'to': "orm['dashboard_app.Bundle']", 'blank': 'True', 'unique': 'True'}),
391
125
            '_results_link': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '400', 'null': 'True', 'db_column': "'results_link'", 'blank': 'True'}),
392
126
            'actual_device': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['lava_scheduler_app.Device']"}),
393
127
            'definition': ('django.db.models.fields.TextField', [], {}),
394
128
            'description': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '200', 'null': 'True', 'blank': 'True'}),
395
129
            'end_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
396
130
            'failure_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
397
131
            'failure_tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'failure_tags'", 'blank': 'True', 'to': "orm['lava_scheduler_app.JobFailureTag']"}),
398
132
            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}),
399
133
            'health_check': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
400
134
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
401
135
            'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
402
136
            'log_file': ('django.db.models.fields.files.FileField', [], {'default': 'None', 'max_length': '100', 'null': 'True', 'blank': 'True'}),
403
137
            'multinode_definition': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
404
138
            'priority': ('django.db.models.fields.IntegerField', [], {'default': '50'}),
405
139
            'requested_device': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['lava_scheduler_app.Device']"}),
406
140
            'requested_device_type': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'+'", 'null': 'True', 'blank': 'True', 'to': "orm['lava_scheduler_app.DeviceType']"}),
407
141
            'start_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
408
142
            'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
409
143
            'sub_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
410
144
            'submit_time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
411
145
            'submit_token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['linaro_django_xmlrpc.AuthToken']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}),
412
146
            'submitter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}),
413
147
            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['lava_scheduler_app.Tag']", 'symmetrical': 'False', 'blank': 'True'}),
414
148
            'target_group': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '64', 'null': 'True', 'blank': 'True'}),
415
149
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'})
416
150
        },
417
151
        'linaro_django_xmlrpc.authtoken': {
418
152
            'Meta': {'object_name': 'AuthToken'},
419
153
            'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
420
154
            'description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
421
155
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
422
156
            'last_used_on': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
423
157
            'secret': ('django.db.models.fields.CharField', [], {'default': "'g4fgt7t5qdghq3qo3t3h5dhbj6fes2zh8n6lkncc0u0rcqxy0kaez7aacw05nc0oxjc3060pj0f1fsunjpo1btk6urfpt8xfmgefcatgmh1e7kj0ams90ikni05sd5qk'", 'unique': 'True', 'max_length': '128'}),
424
158
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_tokens'", 'to': "orm['auth.User']"})
425
159
        }
426
160
    }
427
161
428
162
    complete_apps = ['lava_scheduler_app']
429
0
\ No newline at end of file
163
\ No newline at end of file
430
1
164
431
=== modified file 'lava_scheduler_app/models.py'
432
--- lava_scheduler_app/models.py	2013-08-19 11:41:55 +0000
433
+++ lava_scheduler_app/models.py	2013-08-28 13:47:23 +0000
434
@@ -1,5 +1,6 @@
435
1
import logging
1
import logging
436
2
import os
2
import os
437
3
import uuid
438
3
import simplejson
4
import simplejson
439
4
import urlparse
5
import urlparse
440
5
6
441
@@ -18,6 +19,7 @@
442
18
from dashboard_app.models import Bundle, BundleStream
19
from dashboard_app.models import Bundle, BundleStream
443
19
20
444
20
from lava_dispatcher.job import validate_job_data
21
from lava_dispatcher.job import validate_job_data
445
22
from lava_scheduler_app import utils
446
21
23
447
22
from linaro_django_xmlrpc.models import AuthToken
24
from linaro_django_xmlrpc.models import AuthToken
448
23
25
449
@@ -26,6 +28,10 @@
450
26
    """Error raised when JSON is syntactically valid but ill-formed."""
28
    """Error raised when JSON is syntactically valid but ill-formed."""
451
27
29
452
28
30
453
31
class DevicesUnavailableException(UserWarning):
454
32
    """Error raised when required number of devices are unavailable."""
455
33
456
34
457
29
class Tag(models.Model):
35
class Tag(models.Model):
458
30
36
459
31
    name = models.SlugField(unique=True)
37
    name = models.SlugField(unique=True)
460
@@ -44,6 +50,38 @@
461
44
        raise ValidationError(e)
50
        raise ValidationError(e)
462
45
51
463
46
52
464
53
def check_device_availability(requested_devices):
465
54
    """Checks whether the number of devices requested is available.
466
55
    
467
56
    See utils.requested_device_count() for details of REQUESTED_DEVICES
468
57
    dictionary format.
469
58
470
59
    Returns True if the requested number of devices are available, else
471
60
    raises DevicesUnavailableException.
472
61
    """
473
62
    device_types = DeviceType.objects.values_list('name').filter(
474
63
        models.Q(device__status=Device.IDLE) | \
475
64
            models.Q(device__status=Device.RUNNING)
476
65
        ).annotate(
477
66
        num_count=models.Count('name')
478
67
        ).order_by('name')
479
68
480
69
    if requested_devices:
481
70
        all_devices = {}
482
71
        for dt in device_types:
483
72
            # dt[0] -> device type name
484
73
            # dt[1] -> device type count
485
74
            all_devices[dt[0]] = dt[1]
486
75
487
76
        for board, count in requested_devices.iteritems():
488
77
            if all_devices.get(board, None) and count <= all_devices[board]:
489
78
                continue
490
79
            else:
491
80
                raise DevicesUnavailableException(
492
81
                    "Required number of device(s) unavailable.")
493
82
    return True
494
83
495
84
496
47
class DeviceType(models.Model):
85
class DeviceType(models.Model):
497
48
    """
86
    """
498
49
    A class of device, for example a pandaboard or a snowball.
87
    A class of device, for example a pandaboard or a snowball.
499
@@ -245,6 +283,20 @@
500
245
283
501
246
    id = models.AutoField(primary_key=True)
284
    id = models.AutoField(primary_key=True)
502
247
285
503
286
    sub_id = models.CharField(
504
287
        verbose_name=_(u"Sub ID"),
505
288
        blank=True,
506
289
        max_length=200
507
290
    )
508
291
509
292
    target_group = models.CharField(
510
293
        verbose_name=_(u"Target Group"),
511
294
        blank=True,
512
295
        max_length=64,
513
296
        null=True,
514
297
        default=None
515
298
    )
516
299
517
248
    submitter = models.ForeignKey(
300
    submitter = models.ForeignKey(
518
249
        User,
301
        User,
519
250
        verbose_name=_(u"Submitter"),
302
        verbose_name=_(u"Submitter"),
520
@@ -317,7 +369,16 @@
521
317
    )
369
    )
522
318
370
523
319
    definition = models.TextField(
371
    definition = models.TextField(
525
320
        editable=False,
372
<<<<<<< TREE
526
373
        editable=False,
527
374
=======
528
375
        editable=False,
529
376
    )
530
377
531
378
    multinode_definition = models.TextField(
532
379
        editable=False,
533
380
        blank=True
534
381
>>>>>>> MERGE-SOURCE
535
321
    )
382
    )
536
322
383
537
323
    log_file = models.FileField(
384
    log_file = models.FileField(
538
@@ -386,17 +447,34 @@
539
386
447
540
387
    @classmethod
448
    @classmethod
541
388
    def from_json_and_user(cls, json_data, user, health_check=False):
449
    def from_json_and_user(cls, json_data, user, health_check=False):
542
450
        requested_devices = utils.requested_device_count(json_data)
543
451
        check_device_availability(requested_devices)
544
389
        job_data = simplejson.loads(json_data)
452
        job_data = simplejson.loads(json_data)
545
390
        validate_job_data(job_data)
453
        validate_job_data(job_data)
546
454
547
455
        # Validate job, for parameters, specific to multinode that has been
548
456
        # input by the user. These parameters are reserved by LAVA and
549
457
        # generated during job submissions.
550
458
        reserved_job_params = ["group_size", "role", "sub_id", "target_group"]
551
459
        reserved_params_found = set(reserved_job_params).intersection(
552
460
            set(job_data.keys()))
553
461
        if reserved_params_found:
554
462
            raise JSONDataError("Reserved parameters found in job data %s" %
555
463
                                str([x for x in reserved_params_found]))
556
464
557
391
        if 'target' in job_data:
465
        if 'target' in job_data:
558
392
            target = Device.objects.get(hostname=job_data['target'])
466
            target = Device.objects.get(hostname=job_data['target'])
559
393
            device_type = None
467
            device_type = None
560
394
        elif 'device_type' in job_data:
468
        elif 'device_type' in job_data:
561
395
            target = None
469
            target = None
562
396
            device_type = DeviceType.objects.get(name=job_data['device_type'])
470
            device_type = DeviceType.objects.get(name=job_data['device_type'])
563
471
        elif 'device_group' in job_data:
564
472
            target = None
565
473
            device_type = None
566
397
        else:
474
        else:
567
398
            raise JSONDataError(
475
            raise JSONDataError(
569
399
                "Neither 'target' nor 'device_type' found in job data.")
476
                "No 'target' or 'device_type' or 'device_group' are found "
570
477
                "in job data.")
571
400
478
572
401
        priorities = dict([(j.upper(), i) for i, j in cls.PRIORITY_CHOICES])
479
        priorities = dict([(j.upper(), i) for i, j in cls.PRIORITY_CHOICES])
573
402
        priority = cls.MEDIUM
480
        priority = cls.MEDIUM
574
@@ -449,6 +527,7 @@
575
449
                                          bundle_stream.is_public)
527
                                          bundle_stream.is_public)
576
450
            server = action['parameters']['server']
528
            server = action['parameters']['server']
577
451
            parsed_server = urlparse.urlsplit(server)
529
            parsed_server = urlparse.urlsplit(server)
578
530
            action["parameters"]["server"] = utils.rewrite_hostname(server)
579
452
            if parsed_server.hostname is None:
531
            if parsed_server.hostname is None:
580
453
                raise ValueError("invalid server: %s" % server)
532
                raise ValueError("invalid server: %s" % server)
581
454
533
582
@@ -458,15 +537,49 @@
583
458
                tags.append(Tag.objects.get(name=tag_name))
537
                tags.append(Tag.objects.get(name=tag_name))
584
459
            except Tag.DoesNotExist:
538
            except Tag.DoesNotExist:
585
460
                raise JSONDataError("tag %r does not exist" % tag_name)
539
                raise JSONDataError("tag %r does not exist" % tag_name)
595
461
        job = TestJob(
540
596
462
            definition=json_data, submitter=submitter,
541
        if 'device_group' in job_data:
597
463
            requested_device=target, requested_device_type=device_type,
542
            target_group = str(uuid.uuid4())
598
464
            description=job_name, health_check=health_check, user=user,
543
            node_json = utils.split_multi_job(job_data, target_group)
599
465
            group=group, is_public=is_public, priority=priority)
544
            job_list = []
600
466
        job.save()
545
            try:
601
467
        for tag in tags:
546
                parent_id = (TestJob.objects.latest('id')).id + 1
602
468
            job.tags.add(tag)
547
            except:
603
469
        return job
548
                parent_id = 1
604
549
            child_id = 0
605
550
606
551
            for role in node_json:
607
552
                role_count = len(node_json[role])
608
553
                for c in range(0, role_count):
609
554
                    device_type = DeviceType.objects.get(
610
555
                        name=node_json[role][c]["device_type"])
611
556
                    sub_id = '.'.join([str(parent_id), str(child_id)])
612
557
613
558
                    # Add sub_id to the generated job dictionary.
614
559
                    node_json[role][c]["sub_id"] = sub_id
615
560
616
561
                    job = TestJob(
617
562
                        sub_id=sub_id, submitter=submitter,
618
563
                        requested_device=target, description=job_name,
619
564
                        requested_device_type=device_type,
620
565
                        definition=simplejson.dumps(node_json[role][c]),
621
566
                        multinode_definition=json_data,
622
567
                        health_check=health_check, user=user, group=group,
623
568
                        is_public=is_public, priority=priority,
624
569
                        target_group=target_group)
625
570
                    job.save()
626
571
                    job_list.append(sub_id)
627
572
                    child_id += 1
628
573
            return job_list
629
574
630
575
        else:
631
576
            job = TestJob(
632
577
                definition=simplejson.dumps(job_data), submitter=submitter,
633
578
                requested_device=target, requested_device_type=device_type,
634
579
                description=job_name, health_check=health_check, user=user,
635
580
                group=group, is_public=is_public, priority=priority)
636
581
            job.save()
637
582
            return job
638
470
583
639
471
    def _can_admin(self, user):
584
    def _can_admin(self, user):
640
472
        """ used to check for things like if the user can cancel or annotate
585
        """ used to check for things like if the user can cancel or annotate
641
@@ -529,6 +642,22 @@
642
529
            "LAVA job notification: " + description, mail,
642
            "LAVA job notification: " + description, mail,
643
530
            settings.SERVER_EMAIL, recipients)
643
            settings.SERVER_EMAIL, recipients)
644
531
644
645
645
    @property
646
646
    def sub_jobs_list(self):
647
647
        if self.is_multinode:
648
648
            jobs = TestJob.objects.filter(
649
649
                target_group=self.target_group).order_by('id')
650
650
            return jobs
651
651
        else:
652
652
            return None
653
653
654
654
    @property
655
655
    def is_multinode(self):
656
656
        if self.target_group:
657
657
            return True
658
658
        else:
659
659
            return False
660
660
661
532
661
662
533
class DeviceStateTransition(models.Model):
662
class DeviceStateTransition(models.Model):
663
534
    created_on = models.DateTimeField(auto_now_add=True)
663
    created_on = models.DateTimeField(auto_now_add=True)
664
535
664
665
=== modified file 'lava_scheduler_app/templates/lava_scheduler_app/job_definition.html'
666
--- lava_scheduler_app/templates/lava_scheduler_app/job_definition.html	2011-12-09 03:55:33 +0000
667
+++ lava_scheduler_app/templates/lava_scheduler_app/job_definition.html	2013-08-28 13:47:23 +0000
668
@@ -10,7 +10,7 @@
669
10
{% endblock %}
10
{% endblock %}
670
11
11
671
12
{% block content %}
12
{% block content %}
673
13
<h2>Job defintion file - {{ job.id }} </h2>
13
<h2>Job definition file - {{ job.id }} </h2>
674
14
<a href="{% url lava.scheduler.job.definition.plain job.pk %}">Download as text file</a>
14
<a href="{% url lava.scheduler.job.definition.plain job.pk %}">Download as text file</a>
675
15
<pre class="brush: js">{{ job.definition }}</pre>
15
<pre class="brush: js">{{ job.definition }}</pre>
676
16
16
677
17
17
678
=== modified file 'lava_scheduler_app/templates/lava_scheduler_app/job_sidebar.html'
679
--- lava_scheduler_app/templates/lava_scheduler_app/job_sidebar.html	2013-01-15 17:44:36 +0000
680
+++ lava_scheduler_app/templates/lava_scheduler_app/job_sidebar.html	2013-08-28 13:47:23 +0000
681
@@ -62,6 +62,17 @@
682
62
62
683
63
    <dt>Finished at:</dt>
63
    <dt>Finished at:</dt>
684
64
    <dd>{{ job.end_time|default:"not finished" }}</dd>
64
    <dd>{{ job.end_time|default:"not finished" }}</dd>
685
65
686
66
    {% if job.is_multinode %}
687
67
    <dt>Sub Jobs:</dt>
688
68
    {% for subjob in job.sub_jobs_list %}
689
69
    <dd>
690
70
      <a href="{% url lava.scheduler.job.detail subjob.pk %}">
691
71
        {{ subjob.sub_id }}</a>
692
72
    </dd>
693
73
    {% endfor %}
694
74
    {% endif %}
695
75
696
65
</dl>
76
</dl>
697
66
<h2>Views</h2>
77
<h2>Views</h2>
698
67
<ul>
78
<ul>
699
@@ -76,6 +87,11 @@
700
76
    <li>
87
    <li>
701
77
        <a href="{% url lava.scheduler.job.definition job.pk %}">Definition</a>
88
        <a href="{% url lava.scheduler.job.definition job.pk %}">Definition</a>
702
78
    </li>
89
    </li>
703
90
    {% if job.is_multinode %}
704
91
    <li>
705
92
        <a href="{% url lava.scheduler.job.multinode_definition job.pk %}"> Multinode Definition</a>
706
93
    </li>
707
94
    {% endif %}
708
79
    {% if job.results_link %}
95
    {% if job.results_link %}
709
80
    <li>
96
    <li>
710
81
        <a href="{{ job.results_link }}">Results Bundle</a>
97
        <a href="{{ job.results_link }}">Results Bundle</a>
711
82
98
712
=== modified file 'lava_scheduler_app/templates/lava_scheduler_app/job_submit.html'
713
--- lava_scheduler_app/templates/lava_scheduler_app/job_submit.html	2013-06-28 09:43:44 +0000
714
+++ lava_scheduler_app/templates/lava_scheduler_app/job_submit.html	2013-08-28 13:47:23 +0000
715
@@ -31,6 +31,16 @@
716
31
To view the full job list click <a href="{{ list_url }}">here</a>.
31
To view the full job list click <a href="{{ list_url }}">here</a>.
717
32
</div>
32
</div>
718
33
33
719
34
{% elif job_list %}
720
35
{% url lava.scheduler.job.list as list_url %}
721
36
<div id="job-success">Multinode Job submission successfull!
722
37
<br>
723
38
<br>
724
39
Jobs with ID {{ job_list }}</a> has been created.
725
40
<br>
726
41
To view the full job list click <a href="{{ list_url }}">here</a>.
727
42
</div>
728
43
729
34
{% else %}
44
{% else %}
730
35
45
731
36
{% if error %}
46
{% if error %}
732
37
47
733
=== added file 'lava_scheduler_app/templates/lava_scheduler_app/multinode_job_definition.html'
734
--- lava_scheduler_app/templates/lava_scheduler_app/multinode_job_definition.html	1970-01-01 00:00:00 +0000
735
+++ lava_scheduler_app/templates/lava_scheduler_app/multinode_job_definition.html	2013-08-28 13:47:23 +0000
736
@@ -0,0 +1,21 @@
737
1
{% extends "lava_scheduler_app/job_sidebar.html" %}
738
2
739
3
{% block extrahead %}
740
4
{{ block.super }}
741
5
<script type="text/javascript" src="{{ STATIC_URL }}lava_scheduler_app/js/shCore.js"></script>
742
6
<script type="text/javascript" src="{{ STATIC_URL }}lava_scheduler_app/js/shBrushJScript.js"></script>
743
7
744
8
<link href="{{ STATIC_URL }}lava_scheduler_app/css/shCore.css" rel="stylesheet" type="text/css" />
745
9
<link href="{{ STATIC_URL }}lava_scheduler_app/css/shThemeDefault.css" rel="stylesheet" type="text/css" />
746
10
{% endblock %}
747
11
748
12
{% block content %}
749
13
<h2>Multinode Job definition file - {{ job.sub_id }} </h2>
750
14
<a href="{% url lava.scheduler.job.multinode_definition.plain job.pk %}">Download as text file</a>
751
15
<pre class="brush: js">{{ job.multinode_definition }}</pre>
752
16
753
17
<script type="text/javascript">
754
18
     SyntaxHighlighter.all()
755
19
</script>
756
20
757
21
{% endblock %}
758
0
22
759
=== modified file 'lava_scheduler_app/urls.py'
760
--- lava_scheduler_app/urls.py	2013-07-17 12:20:25 +0000
761
+++ lava_scheduler_app/urls.py	2013-08-28 13:47:23 +0000
762
@@ -79,8 +79,19 @@
763
79
        'job_definition',
79
        'job_definition',
764
80
        name='lava.scheduler.job.definition'),
80
        name='lava.scheduler.job.definition'),
765
81
    url(r'^job/(?P<pk>[0-9]+)/definition/plain$',
81
    url(r'^job/(?P<pk>[0-9]+)/definition/plain$',
768
82
        'job_definition_plain',
82
<<<<<<< TREE
769
83
        name='lava.scheduler.job.definition.plain'),
83
        'job_definition_plain',
770
84
        name='lava.scheduler.job.definition.plain'),
771
85
=======
772
86
        'job_definition_plain',
773
87
        name='lava.scheduler.job.definition.plain'),
774
88
    url(r'^job/(?P<pk>[0-9]+)/multinode_definition$',
775
89
        'multinode_job_definition',
776
90
        name='lava.scheduler.job.multinode_definition'),
777
91
    url(r'^job/(?P<pk>[0-9]+)/multinode_definition/plain$',
778
92
        'multinode_job_definition_plain',
779
93
        name='lava.scheduler.job.multinode_definition.plain'),
780
94
>>>>>>> MERGE-SOURCE
781
84
    url(r'^job/(?P<pk>[0-9]+)/log_file$',
95
    url(r'^job/(?P<pk>[0-9]+)/log_file$',
782
85
        'job_log_file',
96
        'job_log_file',
783
86
        name='lava.scheduler.job.log_file'),
97
        name='lava.scheduler.job.log_file'),
784
87
98
785
=== added file 'lava_scheduler_app/utils.py'
786
--- lava_scheduler_app/utils.py	1970-01-01 00:00:00 +0000
787
+++ lava_scheduler_app/utils.py	2013-08-28 13:47:23 +0000
788
@@ -0,0 +1,117 @@
789
1
# Copyright (C) 2013 Linaro Limited
790
2
#
791
3
# Author: Neil Williams <neil.williams@linaro.org>
792
4
#         Senthil Kumaran <senthil.kumaran@linaro.org>
793
5
#
794
6
# This file is part of LAVA Scheduler.
795
7
#
796
8
# LAVA Scheduler is free software: you can redistribute it and/or modify it
797
9
# under the terms of the GNU Affero General Public License version 3 as
798
10
# published by the Free Software Foundation
799
11
#
800
12
# LAVA Scheduler is distributed in the hope that it will be useful, but
801
13
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
802
14
# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
803
15
# more details.
804
16
#
805
17
# You should have received a copy of the GNU Affero General Public License
806
18
# along with LAVA Scheduler.  If not, see <http://www.gnu.org/licenses/>.
807
19
808
20
import re
809
21
import copy
810
22
import socket
811
23
import urlparse
812
24
import simplejson
813
25
814
26
815
27
def rewrite_hostname(result_url):
816
28
    """If URL has hostname value as localhost/127.0.0.*, change it to the
817
29
    actual server FQDN.
818
30
819
31
    Returns the RESULT_URL (string) re-written with hostname.
820
32
821
33
    See https://cards.linaro.org/browse/LAVA-611
822
34
    """
823
35
    host = urlparse.urlparse(result_url).netloc
824
36
    if host == "localhost":
825
37
        result_url = result_url.replace("localhost", socket.getfqdn())
826
38
    elif host.startswith("127.0.0"):
827
39
        ip_pat = r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}'
828
40
        result_url = re.sub(ip_pat, socket.getfqdn(), result_url)
829
41
    return result_url
830
42
831
43
832
44
def split_multi_job(json_jobdata, target_group):
833
45
    node_json = {}
834
46
    all_nodes = {}
835
47
    node_actions = {}
836
48
    
837
49
    # Check if we are operating on multinode job data. Else return the job
838
50
    # data as it is.
839
51
    if "device_group" in json_jobdata and target_group:
840
52
        pass
841
53
    else:
842
54
        return json_jobdata
843
55
844
56
    # get all the roles and create node action list for each role.
845
57
    for group in json_jobdata["device_group"]:
846
58
        node_actions[group["role"]] = []
847
59
848
60
    # Take each action and assign it to proper roles. If roles are not
849
61
    # specified for a specific action, then assign it to all the roles.
850
62
    all_actions = json_jobdata["actions"]
851
63
    for role in node_actions.keys():
852
64
        for action in all_actions:
853
65
            new_action = copy.deepcopy(action)
854
66
            if 'parameters' in new_action \
855
67
                    and 'role' in new_action["parameters"]:
856
68
                if new_action["parameters"]["role"] == role:
857
69
                    new_action["parameters"].pop('role', None)
858
70
                    node_actions[role].append(new_action)
859
71
            else:
860
72
                node_actions[role].append(new_action)
861
73
862
74
    group_count = 0
863
75
    for clients in json_jobdata["device_group"]:
864
76
        group_count += int(clients["count"])
865
77
    for clients in json_jobdata["device_group"]:
866
78
        role = str(clients["role"])
867
79
        count = int(clients["count"])
868
80
        node_json[role] = []
869
81
        for c in range(0, count):
870
82
            node_json[role].append({})
871
83
            node_json[role][c]["timeout"] = json_jobdata["timeout"]
872
84
            node_json[role][c]["job_name"] = json_jobdata["job_name"]
873
85
            node_json[role][c]["tags"] = clients["tags"]
874
86
            node_json[role][c]["group_size"] = group_count
875
87
            node_json[role][c]["target_group"] = target_group
876
88
            node_json[role][c]["actions"] = node_actions[role]
877
89
878
90
            node_json[role][c]["role"] = role
879
91
            # multinode node stage 2
880
92
            node_json[role][c]["logging_level"] = json_jobdata["logging_level"]
881
93
            node_json[role][c]["device_type"] = clients["device_type"]
882
94
883
95
    return node_json
884
96
885
97
886
98
def requested_device_count(json_data):
887
99
    """Utility function check the requested number of devices for each
888
100
    device_type in a multinode job.
889
101
890
102
    JSON_DATA is the job definition string.
891
103
892
104
    Returns requested_device which is a dictionary of the following format:
893
105
894
106
    {'kvm': 1, 'qemu': 3, 'panda': 1}
895
107
896
108
    If the job is not a multinode job, then return an empty dictionary.
897
109
    """
898
110
    job_data = simplejson.loads(json_data)
899
111
    requested_devices = {}
900
112
    if 'device_group' in job_data:
901
113
        for device_group in job_data['device_group']:
902
114
            device_type = device_group['device_type']
903
115
            count = device_group['count']
904
116
            requested_devices[device_type] = count
905
117
    return requested_devices
906
0
118
907
=== modified file 'lava_scheduler_app/views.py'
908
--- lava_scheduler_app/views.py	2013-07-17 12:20:25 +0000
909
+++ lava_scheduler_app/views.py	2013-08-28 13:47:23 +0000
910
@@ -50,7 +50,12 @@
911
50
    Device,
50
    Device,
912
51
    DeviceType,
51
    DeviceType,
913
52
    DeviceStateTransition,
52
    DeviceStateTransition,
915
53
    TestJob,
53
<<<<<<< TREE
916
54
    TestJob,
917
55
=======
918
56
    TestJob,
919
57
    JSONDataError,
920
58
>>>>>>> MERGE-SOURCE
921
54
    validate_job_json,
59
    validate_job_json,
922
55
)
60
)
923
56
61
924
@@ -74,10 +79,16 @@
925
74
79
926
75
80
927
76
def pklink(record):
81
def pklink(record):
928
82
    job_id = record.pk
929
83
    try:
930
84
        if record.sub_id:
931
85
            job_id = record.sub_id
932
86
    except:
933
87
        pass
934
77
    return mark_safe(
88
    return mark_safe(
935
78
        '<a href="%s">%s</a>' % (
89
        '<a href="%s">%s</a>' % (
936
79
            record.get_absolute_url(),
90
            record.get_absolute_url(),
938
80
            escape(record.pk)))
91
            escape(job_id)))
939
81
92
940
82
93
941
83
class IDLinkColumn(Column):
94
class IDLinkColumn(Column):
942
@@ -100,11 +111,19 @@
943
100
111
944
101
112
945
102
def all_jobs_with_device_sort():
113
def all_jobs_with_device_sort():
946
114
<<<<<<< TREE
947
103
    return TestJob.objects.select_related(
115
    return TestJob.objects.select_related(
948
104
        "actual_device", "requested_device", "requested_device_type",
116
        "actual_device", "requested_device", "requested_device_type",
949
105
        "submitter", "user", "group")\
117
        "submitter", "user", "group")\
950
106
        .extra(select={'device_sort': 'coalesce(actual_device_id, requested_device_id, '
118
        .extra(select={'device_sort': 'coalesce(actual_device_id, requested_device_id, '
951
107
                                      'requested_device_type_id)'}).all()
119
                                      'requested_device_type_id)'}).all()
952
120
=======
953
121
    jobs = TestJob.objects.select_related("actual_device", "requested_device",
954
122
                                          "requested_device_type", "submitter", "user", "group")\
955
123
        .extra(select={'device_sort': 'coalesce(actual_device_id, '
956
124
                                      'requested_device_id, requested_device_type_id)'}).all()
957
125
    return jobs.order_by('submit_time')
958
126
>>>>>>> MERGE-SOURCE
959
108
127
960
109
128
961
110
class JobTable(DataTablesTable):
129
class JobTable(DataTablesTable):
962
@@ -124,7 +143,7 @@
963
124
        else:
143
        else:
964
125
            return ''
144
            return ''
965
126
145
967
127
    id = RestrictedIDLinkColumn()
146
    sub_id = RestrictedIDLinkColumn()
968
128
    status = Column()
147
    status = Column()
969
129
    priority = Column()
148
    priority = Column()
970
130
    device = Column(accessor='device_sort')
149
    device = Column(accessor='device_sort')
971
@@ -135,9 +154,15 @@
972
135
    duration = Column()
154
    duration = Column()
973
136
155
974
137
    datatable_opts = {
156
    datatable_opts = {
975
157
<<<<<<< TREE
976
138
        'aaSorting': [[0, 'desc']],
158
        'aaSorting': [[0, 'desc']],
977
139
    }
159
    }
978
140
    searchable_columns = ['description']
160
    searchable_columns = ['description']
979
161
=======
980
162
        'aaSorting': [[6, 'desc']],
981
163
    }
982
164
    searchable_columns = ['description']
983
165
>>>>>>> MERGE-SOURCE
984
141
166
985
142
167
986
143
class IndexJobTable(JobTable):
168
class IndexJobTable(JobTable):
987
@@ -296,6 +321,10 @@
988
296
    class Meta:
321
    class Meta:
989
297
        exclude = ('status', 'submitter', 'end_time', 'priority', 'description')
322
        exclude = ('status', 'submitter', 'end_time', 'priority', 'description')
990
298
323
991
324
    datatable_opts = {
992
325
        'aaSorting': [[2, 'desc']],
993
326
    }
994
327
995
299
328
996
300
def failed_jobs_json(request):
329
def failed_jobs_json(request):
997
301
    return FailedJobTable.json(request, params=(request,))
330
    return FailedJobTable.json(request, params=(request,))
998
@@ -499,6 +528,10 @@
999
499
    class Meta:
528
    class Meta:
1000
500
        exclude = ('description', 'device')
529
        exclude = ('description', 'device')
1001
501
530
1002
531
    datatable_opts = {
1003
532
        'aaSorting': [[4, 'desc']],
1004
533
    }
1005
534
1006
502
535
1007
503
def health_jobs_json(request, pk):
536
def health_jobs_json(request, pk):
1008
504
    device = get_object_or_404(Device, pk=pk)
537
    device = get_object_or_404(Device, pk=pk)
1009
@@ -582,12 +615,15 @@
1010
582
                job = TestJob.from_json_and_user(
615
                job = TestJob.from_json_and_user(
1011
583
                    request.POST.get("json-input"), request.user)
616
                    request.POST.get("json-input"), request.user)
1012
584
617
1014
585
                response_data["job_id"] = job.id
618
                if isinstance(job, type(list())):
1015
619
                    response_data["job_list"] = job
1016
620
                else:
1017
621
                    response_data["job_id"] = job.id
1018
586
                return render_to_response(
622
                return render_to_response(
1019
587
                    "lava_scheduler_app/job_submit.html",
623
                    "lava_scheduler_app/job_submit.html",
1020
588
                    response_data, RequestContext(request))
624
                    response_data, RequestContext(request))
1021
589
625
1023
590
            except Exception as e:
626
            except (JSONDataError, ValueError) as e:
1024
591
                response_data["error"] = str(e)
627
                response_data["error"] = str(e)
1025
592
                response_data["json_input"] = request.POST.get("json-input")
628
                response_data["json_input"] = request.POST.get("json-input")
1026
593
                return render_to_response(
629
                return render_to_response(
1027
@@ -660,7 +696,30 @@
1028
660
def job_definition_plain(request, pk):
696
def job_definition_plain(request, pk):
1029
661
    job = get_restricted_job(request.user, pk)
697
    job = get_restricted_job(request.user, pk)
1030
662
    response = HttpResponse(job.definition, mimetype='text/plain')
698
    response = HttpResponse(job.definition, mimetype='text/plain')
1032
663
    response['Content-Disposition'] = "attachment; filename=job_%d.json" % job.id
699
<<<<<<< TREE
1033
700
    response['Content-Disposition'] = "attachment; filename=job_%d.json" % job.id
1034
701
=======
1035
702
    response['Content-Disposition'] = "attachment; filename=job_%d.json" % job.id
1036
703
    return response
1037
704
1038
705
1039
706
def multinode_job_definition(request, pk):
1040
707
    job = get_restricted_job(request.user, pk)
1041
708
    log_file = job.output_file()
1042
709
    return render_to_response(
1043
710
        "lava_scheduler_app/multinode_job_definition.html",
1044
711
        {
1045
712
            'job': job,
1046
713
            'job_file_present': bool(log_file),
1047
714
        },
1048
715
        RequestContext(request))
1049
716
1050
717
1051
718
def multinode_job_definition_plain(request, pk):
1052
719
    job = get_restricted_job(request.user, pk)
1053
720
    response = HttpResponse(job.multinode_definition, mimetype='text/plain')
1054
721
    response['Content-Disposition'] = "attachment; filename=multinode_job_%d.json" % job.id
1055
722
>>>>>>> MERGE-SOURCE
1056
664
    return response
723
    return response
1057
665
724
1058
666
725
1059
@@ -764,7 +823,13 @@
1060
764
def job_cancel(request, pk):
823
def job_cancel(request, pk):
1061
765
    job = get_restricted_job(request.user, pk)
824
    job = get_restricted_job(request.user, pk)
1062
766
    if job.can_cancel(request.user):
825
    if job.can_cancel(request.user):
1064
767
        job.cancel()
826
        if job.is_multinode:
1065
827
            multinode_jobs = TestJob.objects.all().filter(
1066
828
                target_group=job.target_group)
1067
829
            for multinode_job in multinode_jobs:
1068
830
                multinode_job.cancel()
1069
831
        else:
1070
832
            job.cancel()
1071
768
        return redirect(job)
833
        return redirect(job)
1072
769
    else:
834
    else:
1073
770
        return HttpResponseForbidden(
835
        return HttpResponseForbidden(
1074
@@ -773,11 +838,38 @@
1075
773
838
1076
774
@post_only
839
@post_only
1077
775
def job_resubmit(request, pk):
840
def job_resubmit(request, pk):
1078
841
1079
842
    response_data = {
1080
843
        'is_authorized': False,
1081
844
        'bread_crumb_trail': BreadCrumbTrail.leading_to(job_list),
1082
845
        }
1083
846
1084
776
    job = get_restricted_job(request.user, pk)
847
    job = get_restricted_job(request.user, pk)
1085
777
    if job.can_resubmit(request.user):
848
    if job.can_resubmit(request.user):
1089
778
        definition = job.definition
849
        response_data["is_authorized"] = True
1090
779
        job = TestJob.from_json_and_user(definition, request.user)
850
1091
780
        return redirect(job)
851
        if job.is_multinode:
1092
852
            definition = job.multinode_definition
1093
853
        else:
1094
854
            definition = job.definition
1095
855
1096
856
        try:
1097
857
            job = TestJob.from_json_and_user(definition, request.user)
1098
858
1099
859
            if isinstance(job, type(list())):
1100
860
                response_data["job_list"] = job
1101
861
                return render_to_response(
1102
862
                    "lava_scheduler_app/job_submit.html",
1103
863
                    response_data, RequestContext(request))
1104
864
            else:
1105
865
                return redirect(job)
1106
866
        except Exception as e:
1107
867
            response_data["error"] = str(e)
1108
868
            response_data["json_input"] = definition
1109
869
            return render_to_response(
1110
870
                "lava_scheduler_app/job_submit.html",
1111
871
                response_data, RequestContext(request))
1112
872
1113
781
    else:
873
    else:
1114
782
        return HttpResponseForbidden(
874
        return HttpResponseForbidden(
1115
783
            "you cannot re-submit this job", content_type="text/plain")
875
            "you cannot re-submit this job", content_type="text/plain")
1116
784
876
1117
=== renamed file 'lava_scheduler_daemon/board.py' => 'lava_scheduler_daemon/board.py.THIS'
1118
=== modified file 'lava_scheduler_daemon/dbjobsource.py'
1119
--- lava_scheduler_daemon/dbjobsource.py	2013-07-17 12:20:25 +0000
1120
+++ lava_scheduler_daemon/dbjobsource.py	2013-08-28 13:47:23 +0000
1121
@@ -3,6 +3,7 @@
1122
3
import os
3
import os
1123
4
import shutil
4
import shutil
1124
5
import urlparse
5
import urlparse
1125
6
import copy
1126
6
7
1127
7
from dashboard_app.models import Bundle
8
from dashboard_app.models import Bundle
1128
8
9
1129
@@ -92,21 +93,135 @@
1130
92
                transaction.leave_transaction_management()
93
                transaction.leave_transaction_management()
1131
93
        return self.deferToThread(wrapper, *args, **kw)
94
        return self.deferToThread(wrapper, *args, **kw)
1132
94
95
1134
95
    def getBoardList_impl(self):
96
    def _get_health_check_jobs(self):
1135
97
        """Gets the list of configured boards and checks which are the boards
1136
98
        that require health check.
1137
99
1138
100
        Returns JOB_LIST which is a set of health check jobs. If no health
1139
101
        check jobs are available returns an empty set.
1140
102
        """
1141
103
        job_list = set()
1142
96
        configured_boards = [
104
        configured_boards = [
1143
97
            x.hostname for x in dispatcher_config.get_devices()]
105
            x.hostname for x in dispatcher_config.get_devices()]
1144
98
        boards = []
106
        boards = []
1145
99
        for d in Device.objects.all():
107
        for d in Device.objects.all():
1146
100
            if d.hostname in configured_boards:
108
            if d.hostname in configured_boards:
1152
101
                boards.append({'hostname': d.hostname})
109
                boards.append(d)
1153
102
        return boards
110
1154
103
111
        for device in boards:
1155
104
    def getBoardList(self):
112
            if device.status != Device.IDLE:
1156
105
        return self.deferForDB(self.getBoardList_impl)
113
                continue
1157
114
            if not device.device_type.health_check_job:
1158
115
                run_health_check = False
1159
116
            elif device.health_status == Device.HEALTH_UNKNOWN:
1160
117
                run_health_check = True
1161
118
            elif device.health_status == Device.HEALTH_LOOPING:
1162
119
                run_health_check = True
1163
120
            elif not device.last_health_report_job:
1164
121
                run_health_check = True
1165
122
            else:
1166
123
                run_health_check = device.last_health_report_job.end_time < \
1167
124
                    datetime.datetime.now() - datetime.timedelta(days=1)
1168
125
            if run_health_check:
1169
126
                job_list.add(self._getHealthCheckJobForBoard(device))
1170
127
        return job_list
1171
128
1172
129
    def _fix_device(self, device, job):
1173
130
        """Associate an available/idle DEVICE to the given JOB.
1174
131
1175
132
        Returns the job with actual_device set to DEVICE.
1176
133
1177
134
        If we are unable to grab the DEVICE then we return None.
1178
135
        """
1179
136
        DeviceStateTransition.objects.create(
1180
137
            created_by=None, device=device, old_state=device.status,
1181
138
            new_state=Device.RUNNING, message=None, job=job).save()
1182
139
        device.status = Device.RUNNING
1183
140
        device.current_job = job
1184
141
        try:
1185
142
            # The unique constraint on current_job may cause this to
1186
143
            # fail in the case of concurrent requests for different
1187
144
            # boards grabbing the same job.  If there are concurrent
1188
145
            # requests for the *same* board they may both return the
1189
146
            # same job -- this is an application level bug though.
1190
147
            device.save()
1191
148
        except IntegrityError:
1192
149
            self.logger.info(
1193
150
                "job %s has been assigned to another board -- rolling back",
1194
151
                job.id)
1195
152
            transaction.rollback()
1196
153
            return None
1197
154
        else:
1198
155
            job.actual_device = device
1199
156
            job.log_file.save(
1200
157
                'job-%s.log' % job.id, ContentFile(''), save=False)
1201
158
            job.submit_token = AuthToken.objects.create(user=job.submitter)
1202
159
            job.definition = simplejson.dumps(self._get_json_data(job),
1203
160
                                              sort_keys=True,
1204
161
                                              indent=4 * ' ')
1205
162
            job.save()
1206
163
            transaction.commit()
1207
164
        return job
1208
165
1209
166
    def getJobList_impl(self):
1210
167
        jobs = TestJob.objects.all().filter(
1211
168
            status=TestJob.SUBMITTED).order_by('-priority', 'submit_time')
1212
169
        job_list = self._get_health_check_jobs()
1213
170
        devices = None
1214
171
        configured_boards = [
1215
172
            x.hostname for x in dispatcher_config.get_devices()]
1216
173
        self.logger.debug("Number of configured_devices: %d" % len(configured_boards))
1217
174
        for job in jobs:
1218
175
            if job.actual_device:
1219
176
                job_list.add(job)
1220
177
            elif job.requested_device:
1221
178
                self.logger.debug("Checking Requested Device")
1222
179
                devices = Device.objects.all().filter(
1223
180
                    hostname=job.requested_device.hostname,
1224
181
                    status=Device.IDLE)
1225
182
            elif job.requested_device_type:
1226
183
                self.logger.debug("Checking Requested Device Type")
1227
184
                devices = Device.objects.all().filter(
1228
185
                    device_type=job.requested_device_type,
1229
186
                    status=Device.IDLE)
1230
187
            else:
1231
188
                continue
1232
189
            if devices:
1233
190
                for d in devices:
1234
191
                    self.logger.debug("Checking %s" % d.hostname)
1235
192
                    if d.hostname in configured_boards:
1236
193
                       if job:
1237
194
                           job = self._fix_device(d, job)
1238
195
                       if job:
1239
196
                           job_list.add(job)
1240
197
1241
198
        # Remove scheduling multinode jobs until all the jobs in the
1242
199
        # target_group are assigned devices.
1243
200
        final_job_list = copy.deepcopy(job_list)
1244
201
        for job in job_list:
1245
202
            if job.is_multinode:
1246
203
                multinode_jobs = TestJob.objects.all().filter(
1247
204
                    target_group=job.target_group)
1248
205
1249
206
                jobs_with_device = 0
1250
207
                for multinode_job in multinode_jobs:
1251
208
                    if multinode_job.actual_device:
1252
209
                        jobs_with_device += 1
1253
210
1254
211
                if len(multinode_jobs) != jobs_with_device:
1255
212
                    final_job_list.difference_update(set(multinode_jobs))
1256
213
                
1257
214
        return final_job_list
1258
215
1259
216
    def getJobList(self):
1260
217
        return self.deferForDB(self.getJobList_impl)
1261
106
218
1262
107
    def _get_json_data(self, job):
219
    def _get_json_data(self, job):
1263
108
        json_data = simplejson.loads(job.definition)
220
        json_data = simplejson.loads(job.definition)
1265
109
        json_data['target'] = job.actual_device.hostname
221
        if job.actual_device:
1266
222
            json_data['target'] = job.actual_device.hostname
1267
223
        elif job.requested_device:
1268
224
            json_data['target'] = job.requested_device.hostname
1269
110
        for action in json_data['actions']:
225
        for action in json_data['actions']:
1270
111
            if not action['command'].startswith('submit_results'):
226
            if not action['command'].startswith('submit_results'):
1271
112
                continue
227
                continue
1272
@@ -171,64 +286,19 @@
1273
171
        else:
286
        else:
1274
172
            return None
287
            return None
1275
173
288
1331
174
    def getJobForBoard_impl(self, board_name):
289
    def getJobDetails_impl(self, job):
1332
175
        while True:
290
        job.status = TestJob.RUNNING
1333
176
            device = Device.objects.get(hostname=board_name)
291
        job.start_time = datetime.datetime.utcnow()
1334
177
            if device.status != Device.IDLE:
292
        shutil.rmtree(job.output_dir, ignore_errors=True)
1335
178
                return None
293
        job.log_file.save('job-%s.log' % job.id, ContentFile(''), save=False)
1336
179
            if not device.device_type.health_check_job:
294
        job.submit_token = AuthToken.objects.create(user=job.submitter)
1337
180
                run_health_check = False
295
        job.save()
1338
181
            elif device.health_status == Device.HEALTH_UNKNOWN:
296
        json_data = self._get_json_data(job)
1339
182
                run_health_check = True
297
        transaction.commit()
1340
183
            elif device.health_status == Device.HEALTH_LOOPING:
298
        return json_data
1286
184
                run_health_check = True
1287
185
            elif not device.last_health_report_job:
1288
186
                run_health_check = True
1289
187
            else:
1290
188
                run_health_check = device.last_health_report_job.end_time < datetime.datetime.now() - datetime.timedelta(days=1)
1291
189
            if run_health_check:
1292
190
                job = self._getHealthCheckJobForBoard(device)
1293
191
            else:
1294
192
                job = self._getJobFromQueue(device)
1295
193
            if job:
1296
194
                DeviceStateTransition.objects.create(
1297
195
                    created_by=None, device=device, old_state=device.status,
1298
196
                    new_state=Device.RUNNING, message=None, job=job).save()
1299
197
                job.status = TestJob.RUNNING
1300
198
                job.start_time = datetime.datetime.utcnow()
1301
199
                job.actual_device = device
1302
200
                device.status = Device.RUNNING
1303
201
                shutil.rmtree(job.output_dir, ignore_errors=True)
1304
202
                device.current_job = job
1305
203
                try:
1306
204
                    # The unique constraint on current_job may cause this to
1307
205
                    # fail in the case of concurrent requests for different
1308
206
                    # boards grabbing the same job.  If there are concurrent
1309
207
                    # requests for the *same* board they may both return the
1310
208
                    # same job -- this is an application level bug though.
1311
209
                    device.save()
1312
210
                except IntegrityError:
1313
211
                    self.logger.info(
1314
212
                        "job %s has been assigned to another board -- "
1315
213
                        "rolling back", job.id)
1316
214
                    transaction.rollback()
1317
215
                    continue
1318
216
                else:
1319
217
                    job.log_file.save(
1320
218
                        'job-%s.log' % job.id, ContentFile(''), save=False)
1321
219
                    job.submit_token = AuthToken.objects.create(user=job.submitter)
1322
220
                    job.save()
1323
221
                    json_data = self._get_json_data(job)
1324
222
                    transaction.commit()
1325
223
                    return json_data
1326
224
            else:
1327
225
                # _getHealthCheckJobForBoard can offline the board, so commit
1328
226
                # in this branch too.
1329
227
                transaction.commit()
1330
228
                return None
1341
229
299
1344
230
    def getJobForBoard(self, board_name):
300
    def getJobDetails(self, job):
1345
231
        return self.deferForDB(self.getJobForBoard_impl, board_name)
301
        return self.deferForDB(self.getJobDetails_impl, job)
1346
232
302
1347
233
    def getOutputDirForJobOnBoard_impl(self, board_name):
303
    def getOutputDirForJobOnBoard_impl(self, board_name):
1348
234
        device = Device.objects.get(hostname=board_name)
304
        device = Device.objects.get(hostname=board_name)
1349
235
305
1350
=== added file 'lava_scheduler_daemon/job.py'
1351
--- lava_scheduler_daemon/job.py	1970-01-01 00:00:00 +0000
1352
+++ lava_scheduler_daemon/job.py	2013-08-28 13:47:23 +0000
1353
@@ -0,0 +1,281 @@
1354
1
# Copyright (C) 2013 Linaro Limited
1355
2
#
1356
3
# Author: Senthil Kumaran <senthil.kumaran@linaro.org>
1357
4
#
1358
5
# This file is part of LAVA Scheduler.
1359
6
#
1360
7
# LAVA Scheduler is free software: you can redistribute it and/or modify it
1361
8
# under the terms of the GNU Affero General Public License version 3 as
1362
9
# published by the Free Software Foundation
1363
10
#
1364
11
# LAVA Scheduler is distributed in the hope that it will be useful, but
1365
12
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
1366
13
# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
1367
14
# more details.
1368
15
#
1369
16
# You should have received a copy of the GNU Affero General Public License
1370
17
# along with LAVA Scheduler.  If not, see <http://www.gnu.org/licenses/>.
1371
18
1372
19
import json
1373
20
import os
1374
21
import signal
1375
22
import tempfile
1376
23
import logging
1377
24
1378
25
from twisted.internet.error import ProcessDone, ProcessExitedAlready
1379
26
from twisted.internet.protocol import ProcessProtocol
1380
27
from twisted.internet import defer, task
1381
28
1382
29
1383
30
def catchall_errback(logger):
1384
31
    def eb(failure):
1385
32
        logger.error(
1386
33
            '%s: %s\n%s', failure.type.__name__, failure.value,
1387
34
            failure.getTraceback())
1388
35
    return eb
1389
36
1390
37
1391
38
class DispatcherProcessProtocol(ProcessProtocol):
1392
39
1393
40
    def __init__(self, deferred, job):
1394
41
        self.logger = logging.getLogger(__name__ + '.DispatcherProcessProtocol')
1395
42
        self.deferred = deferred
1396
43
        self.log_size = 0
1397
44
        self.job = job
1398
45
1399
46
    def childDataReceived(self, childFD, data):
1400
47
        self.log_size += len(data)
1401
48
        if self.log_size > self.job.daemon_options['LOG_FILE_SIZE_LIMIT']:
1402
49
            if not self.job._killing:
1403
50
                self.job.cancel("exceeded log size limit")
1404
51
1405
52
    def childConnectionLost(self, childFD):
1406
53
        self.logger.info("childConnectionLost for %s: %s",
1407
54
                         self.job.board_name, childFD)
1408
55
1409
56
    def processExited(self, reason):
1410
57
        self.logger.info("processExited for %s: %s",
1411
58
                         self.job.board_name, reason.value)
1412
59
1413
60
    def processEnded(self, reason):
1414
61
        self.logger.info("processEnded for %s: %s",
1415
62
                         self.job.board_name, reason.value)
1416
63
        self.deferred.callback(reason.value.exitCode)
1417
64
1418
65
1419
66
class Job(object):
1420
67
1421
68
    def __init__(self, job_data, dispatcher, source, board_name, reactor,
1422
69
                 daemon_options):
1423
70
        self.job_data = job_data
1424
71
        self.dispatcher = dispatcher
1425
72
        self.source = source
1426
73
        self.board_name = board_name
1427
74
        self.logger = logging.getLogger(__name__ + '.Job.' + board_name)
1428
75
        self.reactor = reactor
1429
76
        self.daemon_options = daemon_options
1430
77
        self._json_file = None
1431
78
        self._source_lock = defer.DeferredLock()
1432
79
        self._checkCancel_call = task.LoopingCall(self._checkCancel)
1433
80
        self._signals = ['SIGINT', 'SIGINT', 'SIGTERM', 'SIGTERM', 'SIGKILL']
1434
81
        self._time_limit_call = None
1435
82
        self._killing = False
1436
83
        self._kill_reason = ''
1437
84
1438
85
    def _checkCancel(self):
1439
86
        if self._killing:
1440
87
            self.cancel()
1441
88
        else:
1442
89
            return self._source_lock.run(
1443
90
                self.source.jobCheckForCancellation,
1444
91
                self.board_name).addCallback(self._maybeCancel)
1445
92
1446
93
    def cancel(self, reason=None):
1447
94
        if not self._killing:
1448
95
            if reason is None:
1449
96
                reason = "killing job for unknown reason"
1450
97
            self._kill_reason = reason
1451
98
            self.logger.info(reason)
1452
99
        self._killing = True
1453
100
        if self._signals:
1454
101
            signame = self._signals.pop(0)
1455
102
        else:
1456
103
            self.logger.warning("self._signals is empty!")
1457
104
            signame = 'SIGKILL'
1458
105
        self.logger.info(
1459
106
            'attempting to kill job with signal %s' % signame)
1460
107
        try:
1461
108
            self._protocol.transport.signalProcess(getattr(signal, signame))
1462
109
        except ProcessExitedAlready:
1463
110
            pass
1464
111
1465
112
    def _maybeCancel(self, cancel):
1466
113
        if cancel:
1467
114
            self.cancel("killing job by user request")
1468
115
        else:
1469
116
            logging.debug('not cancelling')
1470
117
1471
118
    def _time_limit_exceeded(self):
1472
119
        self._time_limit_call = None
1473
120
        self.cancel("killing job for exceeding timeout")
1474
121
1475
122
    def run(self):
1476
123
        d = self.source.getOutputDirForJobOnBoard(self.board_name)
1477
124
        return d.addCallback(self._run).addErrback(
1478
125
            catchall_errback(self.logger))
1479
126
1480
127
    def _run(self, output_dir):
1481
128
        d = defer.Deferred()
1482
129
        json_data = self.job_data
1483
130
        fd, self._json_file = tempfile.mkstemp()
1484
131
        with os.fdopen(fd, 'wb') as f:
1485
132
            json.dump(json_data, f)
1486
133
        self._protocol = DispatcherProcessProtocol(d, self)
1487
134
        self.reactor.spawnProcess(
1488
135
            self._protocol, self.dispatcher, args=[
1489
136
                self.dispatcher, self._json_file, '--output-dir', output_dir],
1490
137
            childFDs={0: 0, 1: 'r', 2: 'r'}, env=None)
1491
138
        self._checkCancel_call.start(10)
1492
139
        timeout = max(
1493
140
            json_data['timeout'], self.daemon_options['MIN_JOB_TIMEOUT'])
1494
141
        self._time_limit_call = self.reactor.callLater(
1495
142
            timeout, self._time_limit_exceeded)
1496
143
        d.addBoth(self._exited)
1497
144
        return d
1498
145
1499
146
    def _exited(self, exit_code):
1500
147
        self.logger.info("job finished on %s", self.job_data['target'])
1501
148
        if self._json_file is not None:
1502
149
            os.unlink(self._json_file)
1503
150
        self.logger.info("reporting job completed")
1504
151
        if self._time_limit_call is not None:
1505
152
            self._time_limit_call.cancel()
1506
153
        self._checkCancel_call.stop()
1507
154
        return self._source_lock.run(
1508
155
            self.source.jobCompleted,
1509
156
            self.board_name,
1510
157
            exit_code,
1511
158
            self._killing).addCallback(
1512
159
                lambda r: exit_code)
1513
160
1514
161
1515
162
class SchedulerMonitorPP(ProcessProtocol):
1516
163
1517
164
    def __init__(self, d, board_name):
1518
165
        self.d = d
1519
166
        self.board_name = board_name
1520
167
        self.logger = logging.getLogger(__name__ + '.SchedulerMonitorPP')
1521
168
1522
169
    def childDataReceived(self, childFD, data):
1523
170
        self.logger.warning(
1524
171
            "scheduler monitor for %s produced output: %r on fd %s",
1525
172
            self.board_name, data, childFD)
1526
173
1527
174
    def processEnded(self, reason):
1528
175
        if not reason.check(ProcessDone):
1529
176
            self.logger.error(
1530
177
                "scheduler monitor for %s crashed: %s",
1531
178
                self.board_name, reason)
1532
179
        self.d.callback(None)
1533
180
1534
181
1535
182
class MonitorJob(object):
1536
183
1537
184
    def __init__(self, job_data, dispatcher, source, board_name, reactor,
1538
185
                 daemon_options):
1539
186
        self.logger = logging.getLogger(__name__ + '.MonitorJob')
1540
187
        self.job_data = job_data
1541
188
        self.dispatcher = dispatcher
1542
189
        self.source = source
1543
190
        self.board_name = board_name
1544
191
        self.reactor = reactor
1545
192
        self.daemon_options = daemon_options
1546
193
        self._json_file = None
1547
194
1548
195
    def run(self):
1549
196
        d = defer.Deferred()
1550
197
        json_data = self.job_data
1551
198
        fd, self._json_file = tempfile.mkstemp()
1552
199
        with os.fdopen(fd, 'wb') as f:
1553
200
            json.dump(json_data, f)
1554
201
1555
202
        childFDs = {0: 0, 1: 1, 2: 2}
1556
203
        args = [
1557
204
            'setsid', 'lava-server', 'manage', 'schedulermonitor',
1558
205
            self.dispatcher, str(self.board_name), self._json_file,
1559
206
            '-l', self.daemon_options['LOG_LEVEL']]
1560
207
        if self.daemon_options['LOG_FILE_PATH']:
1561
208
            args.extend(['-f', self.daemon_options['LOG_FILE_PATH']])
1562
209
            childFDs = None
1563
210
        self.logger.info('executing "%s"', ' '.join(args))
1564
211
        self.reactor.spawnProcess(
1565
212
            SchedulerMonitorPP(d, self.board_name), 'setsid',
1566
213
            childFDs=childFDs, env=None, args=args)
1567
214
        d.addBoth(self._exited)
1568
215
        return d
1569
216
1570
217
    def _exited(self, result):
1571
218
        if self._json_file is not None:
1572
219
            os.unlink(self._json_file)
1573
220
        return result
1574
221
1575
222
1576
223
class JobRunner(object):
1577
224
    job_cls = MonitorJob
1578
225
1579
226
    def __init__(self, source, job, dispatcher, reactor, daemon_options,
1580
227
                 job_cls=None):
1581
228
        self.source = source
1582
229
        self.dispatcher = dispatcher
1583
230
        self.reactor = reactor
1584
231
        self.daemon_options = daemon_options
1585
232
        self.job = job
1586
233
        if job.actual_device:
1587
234
            self.board_name = job.actual_device.hostname
1588
235
        elif job.requested_device:
1589
236
            self.board_name = job.requested_device.hostname
1590
237
        if job_cls is not None:
1591
238
            self.job_cls = job_cls
1592
239
        self.running_job = None
1593
240
        self.logger = logging.getLogger(__name__ + '.JobRunner.' + str(job.id))
1594
241
1595
242
    def start(self):
1596
243
        self.logger.debug("processing job")
1597
244
        if self.job is None:
1598
245
            self.logger.debug("no job found for processing")
1599
246
            return
1600
247
        self.source.getJobDetails(self.job).addCallbacks(
1601
248
            self._startJob, self._ebStartJob)
1602
249
1603
250
    def _startJob(self, job_data):
1604
251
        if job_data is None:
1605
252
            self.logger.debug("no job found")
1606
253
            return
1607
254
        self.logger.info("starting job %r", job_data)
1608
255
1609
256
        self.running_job = self.job_cls(
1610
257
            job_data, self.dispatcher, self.source, self.board_name,
1611
258
            self.reactor, self.daemon_options)
1612
259
        d = self.running_job.run()
1613
260
        d.addCallbacks(self._cbJobFinished, self._ebJobFinished)
1614
261
1615
262
    def _ebStartJob(self, result):
1616
263
        self.logger.error(
1617
264
            '%s: %s\n%s', result.type.__name__, result.value,
1618
265
            result.getTraceback())
1619
266
        return
1620
267
1621
268
    def stop(self):
1622
269
        self.logger.debug("stopping")
1623
270
1624
271
        if self.running_job is not None:
1625
272
            self.logger.debug("job running; deferring stop")
1626
273
        else:
1627
274
            self.logger.debug("stopping immediately")
1628
275
            return defer.succeed(None)
1629
276
1630
277
    def _ebJobFinished(self, result):
1631
278
        self.logger.exception(result.value)
1632
279
1633
280
    def _cbJobFinished(self, result):
1634
281
        self.running_job = None
1635
0
282
1636
=== modified file 'lava_scheduler_daemon/service.py'
1637
--- lava_scheduler_daemon/service.py	2012-12-03 05:03:38 +0000
1638
+++ lava_scheduler_daemon/service.py	2013-08-28 13:47:23 +0000
1639
@@ -1,58 +1,56 @@
1640
1
# Copyright (C) 2013 Linaro Limited
1641
2
#
1642
3
# Author: Senthil Kumaran <senthil.kumaran@linaro.org>
1643
4
#
1644
5
# This file is part of LAVA Scheduler.
1645
6
#
1646
7
# LAVA Scheduler is free software: you can redistribute it and/or modify it
1647
8
# under the terms of the GNU Affero General Public License version 3 as
1648
9
# published by the Free Software Foundation
1649
10
#
1650
11
# LAVA Scheduler is distributed in the hope that it will be useful, but
1651
12
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
1652
13
# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
1653
14
# more details.
1654
15
#
1655
16
# You should have received a copy of the GNU Affero General Public License
1656
17
# along with LAVA Scheduler.  If not, see <http://www.gnu.org/licenses/>.
1657
18
1658
1
import logging
19
import logging
1659
2
20
1660
3
from twisted.application.service import Service
21
from twisted.application.service import Service
1661
4
from twisted.internet import defer
22
from twisted.internet import defer
1662
5
from twisted.internet.task import LoopingCall
23
from twisted.internet.task import LoopingCall
1663
6
24
1668
7
from lava_scheduler_daemon.board import Board, catchall_errback
25
from lava_scheduler_daemon.job import JobRunner, catchall_errback
1669
8
26
1670
9
27
1671
10
class BoardSet(Service):
28
class JobQueue(Service):
1672
11
29
1673
12
    def __init__(self, source, dispatcher, reactor, daemon_options):
30
    def __init__(self, source, dispatcher, reactor, daemon_options):
1675
13
        self.logger = logging.getLogger(__name__ + '.BoardSet')
31
        self.logger = logging.getLogger(__name__ + '.JobQueue')
1676
14
        self.source = source
32
        self.source = source
1677
15
        self.boards = {}
1678
16
        self.dispatcher = dispatcher
33
        self.dispatcher = dispatcher
1679
17
        self.reactor = reactor
34
        self.reactor = reactor
1680
18
        self.daemon_options = daemon_options
35
        self.daemon_options = daemon_options
1708
19
        self._update_boards_call = LoopingCall(self._updateBoards)
36
        self._check_job_call = LoopingCall(self._checkJobs)
1709
20
        self._update_boards_call.clock = reactor
37
        self._check_job_call.clock = reactor
1710
21
38
1711
22
    def _updateBoards(self):
39
    def _checkJobs(self):
1712
23
        self.logger.debug("Refreshing board list")
40
        self.logger.debug("Refreshing jobs")
1713
24
        return self.source.getBoardList().addCallback(
41
        return self.source.getJobList().addCallback(
1714
25
            self._cbUpdateBoards).addErrback(catchall_errback(self.logger))
42
            self._cbCheckJobs).addErrback(catchall_errback(self.logger))
1715
26
43
1716
27
    def _cbUpdateBoards(self, board_cfgs):
44
    def _cbCheckJobs(self, job_list):
1717
28
        '''board_cfgs is an array of dicts {hostname=name} '''
45
        for job in job_list:
1718
29
        new_boards = {}
46
            new_job = JobRunner(self.source, job, self.dispatcher,
1719
30
        for board_cfg in board_cfgs:
47
                                self.reactor, self.daemon_options)
1720
31
            board_name = board_cfg['hostname']
48
            self.logger.info("Starting Job: %d " % job.id)
1721
32
49
            new_job.start()
1695
33
            if board_cfg['hostname'] in self.boards:
1696
34
                board = self.boards.pop(board_name)
1697
35
                new_boards[board_name] = board
1698
36
            else:
1699
37
                self.logger.info("Adding board: %s" % board_name)
1700
38
                new_boards[board_name] = Board(
1701
39
                    self.source, board_name, self.dispatcher, self.reactor,
1702
40
                    self.daemon_options)
1703
41
                new_boards[board_name].start()
1704
42
        for board in self.boards.values():
1705
43
            self.logger.info("Removing board: %s" % board.board_name)
1706
44
            board.stop()
1707
45
        self.boards = new_boards
1722
46
50
1723
47
    def startService(self):
51
    def startService(self):
1725
48
        self._update_boards_call.start(20)
52
        self._check_job_call.start(20)
1726
49
53
1727
50
    def stopService(self):
54
    def stopService(self):
1736
51
        self._update_boards_call.stop()
55
        self._check_job_call.stop()
1737
52
        ds = []
56
        return None
1730
53
        dead_boards = []
1731
54
        for board in self.boards.itervalues():
1732
55
            ds.append(board.stop().addCallback(dead_boards.append))
1733
56
        self.logger.info(
1734
57
            "waiting for %s boards", len(self.boards) - len(dead_boards))
1735
58
        return defer.gatherResults(ds)
1738
59
57
1739
=== modified file 'lava_scheduler_daemon/tests/test_board.py'
1740
--- lava_scheduler_daemon/tests/test_board.py	2013-07-17 12:20:25 +0000
1741
+++ lava_scheduler_daemon/tests/test_board.py	2013-08-28 13:47:23 +0000
1742
@@ -38,7 +38,7 @@
1743
38
38
1744
39
class TestJob(object):
39
class TestJob(object):
1745
40
40
1747
41
    def __init__(self, job_data, dispatcher, source, board_name, reactor, options, use_celery):
41
    def __init__(self, job_data, dispatcher, source, board_name, reactor, options):
1748
42
        self.json_data = job_data
42
        self.json_data = job_data
1749
43
        self.dispatcher = dispatcher
43
        self.dispatcher = dispatcher
1750
44
        self.reactor = reactor
44
        self.reactor = reactor
Status:	Merged
Approved by:	Neil Williams on 2013-08-28
Approved revision:	285
Merged at revision:	255
Proposed branch:	lp:lava-scheduler/multinode
Merge into:	lp:lava-scheduler
Diff against target:	1750 lines (+1225/-137) (has conflicts) 17 files modified lava_scheduler_app/api.py (+19/-3) lava_scheduler_app/management/commands/scheduler.py (+2/-2) lava_scheduler_app/management/commands/schedulermonitor.py (+1/-1) lava_scheduler_app/migrations/0030_auto__add_field_testjob_sub_id__add_field_testjob_target_group.py (+165/-0) lava_scheduler_app/migrations/0031_auto__add_field_testjob_multinode_definition.py (+162/-0) lava_scheduler_app/models.py (+140/-11) lava_scheduler_app/templates/lava_scheduler_app/job_definition.html (+1/-1) lava_scheduler_app/templates/lava_scheduler_app/job_sidebar.html (+16/-0) lava_scheduler_app/templates/lava_scheduler_app/job_submit.html (+10/-0) lava_scheduler_app/templates/lava_scheduler_app/multinode_job_definition.html (+21/-0) lava_scheduler_app/urls.py (+13/-2) lava_scheduler_app/utils.py (+117/-0) lava_scheduler_app/views.py (+102/-10) lava_scheduler_daemon/dbjobsource.py (+134/-64) lava_scheduler_daemon/job.py (+281/-0) lava_scheduler_daemon/service.py (+40/-42) lava_scheduler_daemon/tests/test_board.py (+1/-1) Text conflict in lava_scheduler_app/models.py Text conflict in lava_scheduler_app/urls.py Text conflict in lava_scheduler_app/views.py Contents conflict in lava_scheduler_daemon/board.py
To merge this branch:	bzr merge lp:lava-scheduler/multinode
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Neil Williams		Approve on 2013-08-28
Antonio Terceiro	2013-08-20	Needs Fixing on 2013-08-26
Review via email: mp+181103@code.launchpad.net