-
Notifications
You must be signed in to change notification settings - Fork 352
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug 1270629 - Add initial parts of jobdetail model/API
Ingestion not turned on (yet), pending initial migration of data
- Loading branch information
Showing
7 changed files
with
219 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
from django.core.urlresolvers import reverse | ||
|
||
from treeherder.model.models import (Job, | ||
JobDetail) | ||
|
||
|
||
def test_job_details(test_repository, webapp): | ||
details = { | ||
'abcd': { | ||
'title': 'title', | ||
'value': 'value1', | ||
'url': None | ||
}, | ||
'efgh': { | ||
'title': None, | ||
'value': 'value2', | ||
'url': None | ||
}, | ||
'ijkl': { | ||
'title': 'title3', | ||
'value': 'value3', | ||
'url': 'https://localhost/foo' | ||
} | ||
} | ||
|
||
# create some job details for some fake jobs | ||
i = 0 | ||
for (job_guid, params) in details.iteritems(): | ||
print job_guid | ||
job = Job.objects.create(guid=job_guid, | ||
repository=test_repository, | ||
project_specific_id=i) | ||
JobDetail.objects.create( | ||
job=job, **params) | ||
i += 1 | ||
print JobDetail.objects.filter(job__guid='abcd') | ||
# get them all | ||
resp = webapp.get(reverse('jobdetail-list')) | ||
assert resp.status_int == 200 | ||
assert len(resp.json['results']) == 3 | ||
for result in resp.json['results']: | ||
job_guid = result['job_guid'] | ||
del result['job_guid'] | ||
assert result == details[job_guid] | ||
|
||
# filter to just get one guid at a time | ||
for (guid, detail) in details.iteritems(): | ||
resp = webapp.get(reverse('jobdetail-list') + '?job__guid={}'.format( | ||
guid)) | ||
assert resp.status_int == 200 | ||
assert len(resp.json['results']) == 1 | ||
result = resp.json['results'][0] | ||
del result['job_guid'] | ||
assert result == details[guid] |
78 changes: 78 additions & 0 deletions
78
treeherder/model/management/commands/migrate_job_info_artifacts.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
import sys | ||
import time | ||
from optparse import make_option | ||
|
||
from django.core.management.base import BaseCommand | ||
from django.db import transaction | ||
|
||
from treeherder.model.derived import ArtifactsModel | ||
from treeherder.model.models import (Datasource, | ||
Job, | ||
JobDetail, | ||
Repository) | ||
|
||
|
||
class Command(BaseCommand): | ||
|
||
help = 'Migrate existing jobs to intermediate jobs table' | ||
option_list = BaseCommand.option_list + ( | ||
make_option('--project', | ||
action='append', | ||
dest='project', | ||
help='Filter deletion to particular project(s)', | ||
type='string'), | ||
make_option('--interval', | ||
dest='interval', | ||
help='Wait specified number of seconds between job info migrations', | ||
type='float', | ||
default=0.0)) | ||
|
||
def handle(self, *args, **options): | ||
if options['project']: | ||
datasources = Datasource.objects.filter( | ||
project__in=options['project']) | ||
else: | ||
datasources = Datasource.objects.all() | ||
for ds in datasources: | ||
self.stdout.write('{}\n'.format(ds.project)) | ||
|
||
repository = Repository.objects.get(name=ds.project) | ||
offset = 0 | ||
limit = 10000 | ||
while True: | ||
job_ids = set(Job.objects.order_by( | ||
'project_specific_id').filter( | ||
project_specific_id__gt=offset, | ||
repository=repository).values_list( | ||
'project_specific_id', flat=True)[:limit]) | ||
if len(job_ids) == 0: | ||
break | ||
max_job_id = max(job_ids) | ||
# filter out those job ids for which we already have | ||
# generated job details | ||
job_ids -= set(JobDetail.objects.filter( | ||
job__repository=repository, | ||
job__project_specific_id__in=job_ids).values_list( | ||
'job__project_specific_id', flat=True)) | ||
if job_ids: | ||
with ArtifactsModel(ds.project) as am: | ||
am.DEBUG = False | ||
artifacts = am.get_job_artifact_list(0, 10000, { | ||
'job_id': set([('IN', tuple(job_ids))]), | ||
'name': set([("=", "Job Info")])}) | ||
with transaction.atomic(): | ||
for artifact in artifacts: | ||
for job_detail_dict in artifact['blob']['job_details']: | ||
intermediate_job = Job.objects.get( | ||
repository=repository, | ||
project_specific_id=artifact['job_id']) | ||
JobDetail.objects.create( | ||
job=intermediate_job, | ||
title=job_detail_dict.get('title'), | ||
value=job_detail_dict['value'], | ||
url=job_detail_dict.get('url')) | ||
self.stdout.write('{} '.format(offset)) | ||
sys.stdout.flush() | ||
offset = max_job_id | ||
time.sleep(options['interval']) | ||
self.stdout.write("\n") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
# -*- coding: utf-8 -*- | ||
from __future__ import unicode_literals | ||
|
||
from django.db import migrations, models | ||
import treeherder.model.fields | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('model', '0020_update_job_name_length'), | ||
] | ||
|
||
operations = [ | ||
migrations.CreateModel( | ||
name='JobDetail', | ||
fields=[ | ||
('id', treeherder.model.fields.BigAutoField(serialize=False, primary_key=True)), | ||
('title', models.CharField(max_length=200, null=True)), | ||
('value', models.CharField(max_length=200)), | ||
('url', models.URLField(null=True)), | ||
('job', treeherder.model.fields.FlexibleForeignKey(to='model.Job')), | ||
], | ||
options={ | ||
'db_table': 'job_detail', | ||
}, | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters