htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Swap runner during score if timeout occurred

Browse Source
This commit is contained in:
Sebastian Serth
2021-11-04 17:07:58 +01:00
parent 107ff03eec
commit 92eafa145c
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/models/submission.rb
View File

@ -142,8 +142,13 @@ class Submission < ApplicationRecord
file_scores = nil file_scores = nil
# If prepared_runner raises an error, no Testrun will be created. # If prepared_runner raises an error, no Testrun will be created.
prepared_runner do |runner, waiting_duration| prepared_runner do |runner, waiting_duration|
file_scores = collect_files.select(&:teacher_defined_assessment?).map do |file| assessments = collect_files.select(&:teacher_defined_assessment?)
assessment_number = assessments.size
file_scores = assessments.map.with_index(1) do |file, index|
output = run_test_file file, runner, waiting_duration output = run_test_file file, runner, waiting_duration
# If the previous execution failed and there is at least one more test, we request a new runner.
runner, waiting_duration = swap_runner(runner) if output[:status] == :timeout && index < assessment_number
score_file(output, file) score_file(output, file)
end end
end end
@ -176,7 +181,7 @@ class Submission < ApplicationRecord
def run_test_file(file, runner, waiting_duration) def run_test_file(file, runner, waiting_duration)
test_command = command_for execution_environment.test_command, file.name_with_extension test_command = command_for execution_environment.test_command, file.name_with_extension
result = {file_role: file.role, waiting_for_container_time: waiting_duration} result = {file_role: file.role, waiting_for_container_time: waiting_duration}
output = runner.execute_command(test_command) output = runner.execute_command(test_command, raise_exception: false)
result.merge(output) result.merge(output)
end end
@ -197,6 +202,18 @@ class Submission < ApplicationRecord
yield(runner, waiting_duration) yield(runner, waiting_duration)
end end
def swap_runner(old_runner)
old_runner.update(runner_id: nil)
new_runner = nil
new_waiting_duration = nil
# We request a new runner that will also include all files of the current submission
prepared_runner do |runner, waiting_duration|
new_runner = runner
new_waiting_duration = waiting_duration
end
[new_runner, new_waiting_duration]
end
def command_for(template, file) def command_for(template, file)
filepath = collect_files.find {|f| f.name_with_extension == file }.filepath filepath = collect_files.find {|f| f.name_with_extension == file }.filepath
template % command_substitutions(filepath) template % command_substitutions(filepath)