Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to JiHu GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Chenhao Ma
core
Commits
9b4aa1c5
Commit
9b4aa1c5
authored
7 years ago
by
Nathaniel Kofalt
Browse files
Options
Downloads
Patches
Plain Diff
Add job profile
parent
c210f694
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
api/jobs/handlers.py
+2
-1
2 additions, 1 deletion
api/jobs/handlers.py
api/jobs/jobs.py
+9
-3
9 additions, 3 deletions
api/jobs/jobs.py
api/placer.py
+17
-7
17 additions, 7 deletions
api/placer.py
with
28 additions
and
11 deletions
api/jobs/handlers.py
+
2
−
1
View file @
9b4aa1c5
...
...
@@ -444,8 +444,9 @@ class JobHandler(base.RequestHandler):
def
prepare_complete
(
self
,
_id
):
payload
=
self
.
request
.
json
success
=
payload
[
'
success
'
]
elapsed
=
payload
[
'
elapsed
'
]
ticket
=
JobTicket
.
create
(
_id
,
success
)
ticket
=
JobTicket
.
create
(
_id
,
success
,
elapsed
)
return
{
'
ticket
'
:
ticket
}
@require_login
...
...
This diff is collapsed.
Click to expand it.
api/jobs/jobs.py
+
9
−
3
View file @
9b4aa1c5
...
...
@@ -21,7 +21,7 @@ class Job(object):
modified
=
None
,
state
=
'
pending
'
,
request
=
None
,
id_
=
None
,
config_
=
None
,
now
=
False
,
origin
=
None
,
saved_files
=
None
,
produced_metadata
=
None
,
batch
=
None
,
failed_output_accepted
=
False
):
failed_output_accepted
=
False
,
profile
=
None
):
"""
Creates a job.
...
...
@@ -71,6 +71,8 @@ class Job(object):
created
=
time_now
if
modified
is
None
:
modified
=
time_now
if
profile
is
None
:
profile
=
{}
if
destination
is
None
and
inputs
is
not
None
:
# Grab an arbitrary input's container
...
...
@@ -106,6 +108,7 @@ class Job(object):
self
.
produced_metadata
=
produced_metadata
self
.
batch
=
batch
self
.
failed_output_accepted
=
failed_output_accepted
self
.
profile
=
profile
def
intention_equals
(
self
,
other_job
):
...
...
@@ -165,7 +168,9 @@ class Job(object):
saved_files
=
d
.
get
(
'
saved_files
'
),
produced_metadata
=
d
.
get
(
'
produced_metadata
'
),
batch
=
d
.
get
(
'
batch
'
),
failed_output_accepted
=
d
.
get
(
'
failed_output_accepted
'
,
False
))
failed_output_accepted
=
d
.
get
(
'
failed_output_accepted
'
,
False
),
profile
=
d
.
get
(
'
profile
'
,
{})
)
@classmethod
def
get
(
cls
,
_id
):
...
...
@@ -380,12 +385,13 @@ class JobTicket(object):
return
config
.
db
.
job_tickets
.
find_one
({
'
_id
'
:
bson
.
ObjectId
(
_id
)})
@staticmethod
def
create
(
job_id
,
success
):
def
create
(
job_id
,
success
,
elapsed
):
j
=
Job
.
get
(
job_id
)
result
=
config
.
db
.
job_tickets
.
insert_one
({
'
job
'
:
j
.
id_
,
'
success
'
:
success
,
'
elapsed
'
:
elapsed
,
})
return
result
.
inserted_id
...
...
This diff is collapsed.
Click to expand it.
api/placer.py
+
17
−
7
View file @
9b4aa1c5
...
...
@@ -325,15 +325,25 @@ class EnginePlacer(Placer):
if
job_ticket
is
not
None
:
if
success
:
Queue
.
mutate
(
job
,
{
'
state
'
:
'
complete
'
})
Queue
.
mutate
(
job
,
{
'
state
'
:
'
complete
'
,
'
profile
'
:
{
'
elapsed
'
:
job_ticket
[
'
elapsed
'
]
}
})
else
:
Queue
.
mutate
(
job
,
{
'
state
'
:
'
failed
'
})
Queue
.
mutate
(
job
,
{
'
state
'
:
'
failed
'
,
'
profile
'
:
{
'
elapsed
'
:
job_ticket
[
'
elapsed
'
]
}
})
if
self
.
context
.
get
(
'
job_id
'
):
job
=
Job
.
get
(
self
.
context
.
get
(
'
job_id
'
))
job
.
saved_files
=
[
f
[
'
name
'
]
for
f
in
self
.
saved
]
job
.
produced_metadata
=
self
.
metadata
job
.
save
()
#
if self.context.get('job_id'):
#
job = Job.get(self.context.get('job_id'))
#
job.saved_files = [f['name'] for f in self.saved]
#
job.produced_metadata = self.metadata
#
job.save()
self
.
recalc_session_compliance
()
return
self
.
saved
...
...
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