Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
beat
beat.web
Commits
0332a1c2
Commit
0332a1c2
authored
Oct 25, 2018
by
Samuel GAIST
Browse files
[backend][helpers] Simply block canceling and failure code
parent
ac559ecd
Pipeline
#24560
passed with stage
in 27 minutes and 11 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
beat/web/backend/helpers.py
View file @
0332a1c2
...
...
@@ -712,9 +712,7 @@ def update_job(job):
cached_file
.
update
(
Block
.
FAILED
)
# Update the block
job
.
block
.
status
=
Block
.
FAILED
job
.
block
.
end_date
=
job
.
end_date
job
.
block
.
save
()
job
.
block
.
set_failed
(
job
.
end_date
)
# Cancel all the remaining blocks of the experiment
splits_to_cancel
.
extend
(
cancel_all_blocks
(
job
.
block
.
experiment
))
...
...
@@ -728,9 +726,7 @@ def update_job(job):
mirror_job
.
end_date
=
job
.
end_date
mirror_job
.
save
()
mirror_job
.
block
.
status
=
Block
.
FAILED
mirror_job
.
block
.
end_date
=
job
.
end_date
mirror_job
.
block
.
save
()
mirror_job
.
block
.
set_failed
(
job
.
end_date
)
# Cancel all the remaining blocks of the experiment
splits_to_cancel
.
extend
(
cancel_all_blocks
(
mirror_job
.
block
.
experiment
))
...
...
@@ -795,9 +791,7 @@ def update_job(job):
cached_file
.
update
(
Block
.
CANCELLED
)
# Update the block
job
.
block
.
status
=
Block
.
CANCELLED
job
.
block
.
end_date
=
job
.
end_date
job
.
block
.
save
()
job
.
block
.
set_canceled
(
job
.
end_date
)
# Update the experiment
update_experiment
(
job
.
block
.
experiment
)
...
...
@@ -874,12 +868,7 @@ def cancel_all_blocks(experiment):
# (If possible) Mark the block as cancelled
if
block
.
job
.
splits
.
filter
(
status
=
JobSplit
.
CANCELLING
).
count
()
==
0
:
block
.
status
=
Block
.
CANCELLED
block
.
end_date
=
datetime
.
now
()
if
block
.
start_date
is
None
:
block
.
start_date
=
block
.
end_date
block
.
save
()
block
.
set_canceled
()
block
.
job
.
delete
()
...
...
@@ -888,15 +877,9 @@ def cancel_all_blocks(experiment):
.
filter
(
job__mirror
=
True
)
for
block
in
mirror_blocks_to_cancel
:
block
.
status
=
Block
.
CANCELLED
block
.
end_date
=
datetime
.
now
()
if
block
.
start_date
is
None
:
block
.
start_date
=
block
.
end_date
block
.
save
()
block
.
set_canceled
()
block
.
job
.
delete
()
return
splits_to_cancel
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment