Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
beat.web
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
beat
beat.web
Commits
bfe71ee6
Commit
bfe71ee6
authored
8 years ago
by
André Anjos
Browse files
Options
Downloads
Patches
Plain Diff
[backend] Make job a o2o field
parent
5d499bb2
No related branches found
No related tags found
1 merge request
!194
Scheduler
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
beat/web/backend/migrations/0002_scheduler_addons.py
+1
-1
1 addition, 1 deletion
beat/web/backend/migrations/0002_scheduler_addons.py
beat/web/backend/models.py
+13
-3
13 additions, 3 deletions
beat/web/backend/models.py
with
14 additions
and
4 deletions
beat/web/backend/migrations/0002_scheduler_addons.py
+
1
−
1
View file @
bfe71ee6
...
@@ -141,7 +141,7 @@ class Migration(migrations.Migration):
...
@@ -141,7 +141,7 @@ class Migration(migrations.Migration):
(
'
start_date
'
,
models
.
DateTimeField
(
null
=
True
,
blank
=
True
)),
(
'
start_date
'
,
models
.
DateTimeField
(
null
=
True
,
blank
=
True
)),
(
'
end_date
'
,
models
.
DateTimeField
(
null
=
True
,
blank
=
True
)),
(
'
end_date
'
,
models
.
DateTimeField
(
null
=
True
,
blank
=
True
)),
(
'
split_errors
'
,
models
.
PositiveIntegerField
(
default
=
0
)),
(
'
split_errors
'
,
models
.
PositiveIntegerField
(
default
=
0
)),
(
'
block
'
,
models
.
ForeignKey
(
related_name
=
'
job
'
,
on_delete
=
models
.
deletion
.
SET_NULL
,
to
=
'
experiments.Block
'
,
null
=
True
)),
(
'
block
'
,
models
.
OneToOneField
(
related_name
=
'
job
'
,
on_delete
=
models
.
deletion
.
CASCADE
,
to
=
'
experiments.Block
'
,
null
=
True
)),
(
'
parent
'
,
models
.
ForeignKey
(
related_name
=
'
child
'
,
to
=
'
backend.Job
'
,
null
=
True
)),
(
'
parent
'
,
models
.
ForeignKey
(
related_name
=
'
child
'
,
to
=
'
backend.Job
'
,
null
=
True
)),
(
'
result
'
,
models
.
ForeignKey
(
to
=
'
backend.Result
'
,
null
=
True
)),
(
'
result
'
,
models
.
ForeignKey
(
to
=
'
backend.Result
'
,
null
=
True
)),
],
],
...
...
This diff is collapsed.
Click to expand it.
beat/web/backend/models.py
+
13
−
3
View file @
bfe71ee6
...
@@ -130,6 +130,9 @@ class Environment(Shareable):
...
@@ -130,6 +130,9 @@ class Environment(Shareable):
args
=
(
self
.
name
,
self
.
version
,),
args
=
(
self
.
name
,
self
.
version
,),
)
)
def
get_admin_change_url
(
self
):
return
reverse
(
'
admin:backend_environment_change
'
,
args
=
(
self
.
id
,))
def
queues_for
(
self
,
user
):
def
queues_for
(
self
,
user
):
"""
Returns all queues associated to this environment for which the user
"""
Returns all queues associated to this environment for which the user
has the
'
can_access
'
permission
"""
has the
'
can_access
'
permission
"""
...
@@ -193,9 +196,13 @@ class Worker(models.Model):
...
@@ -193,9 +196,13 @@ class Worker(models.Model):
return
self
.
name
return
self
.
name
def
get_admin_change_url
(
self
):
return
reverse
(
'
admin:backend_worker_change
'
,
args
=
(
self
.
id
,))
def
load
(
self
):
def
load
(
self
):
'''
Calculates the number of cores being used currently
'''
'''
Calculates the number of cores being used currently
'''
return
sum
([
j
.
job
.
block
.
queue
.
cores_per_slot
for
j
in
self
.
splits
])
return
sum
([
j
.
job
.
block
.
queue
.
cores_per_slot
for
j
in
self
.
splits
.
all
()
])
def
available_cores
(
self
):
def
available_cores
(
self
):
...
@@ -275,6 +282,9 @@ class Queue(models.Model):
...
@@ -275,6 +282,9 @@ class Queue(models.Model):
return
self
.
name
return
self
.
name
def
get_admin_change_url
(
self
):
return
reverse
(
'
admin:backend_queue_change
'
,
args
=
(
self
.
id
,))
#_____ Utilities __________
#_____ Utilities __________
def
number_of_slots
(
self
):
def
number_of_slots
(
self
):
...
@@ -447,8 +457,8 @@ class Job(models.Model):
...
@@ -447,8 +457,8 @@ class Job(models.Model):
(
CANCELLED
,
'
Cancelled
'
),
(
CANCELLED
,
'
Cancelled
'
),
)
)
block
=
models
.
ForeignKey
(
'
experiments.Block
'
,
null
=
True
,
block
=
models
.
OneToOneField
(
'
experiments.Block
'
,
null
=
True
,
on_delete
=
models
.
SET_NULL
,
related_name
=
'
job
'
)
on_delete
=
models
.
CASCADE
,
related_name
=
'
job
'
)
status
=
models
.
CharField
(
max_length
=
1
,
choices
=
STATUS
,
default
=
QUEUED
)
status
=
models
.
CharField
(
max_length
=
1
,
choices
=
STATUS
,
default
=
QUEUED
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment