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

Merge pull request #1103 from openHPI/fix/execution_environment_update_without_runner_management

Browse Source 
Check Runner management status in execution environment updates
This commit is contained in:
Sebastian Serth
2021-12-08 00:33:41 +01:00
committed by GitHub
parent 1aba2f2164 1a5d512689
commit 8faa35e629
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/execution_environment.rb
View File

@ -80,7 +80,7 @@ class ExecutionEnvironment < ApplicationRecord
def validate_docker_image? def validate_docker_image?
# We only validate the code execution with the provided image if there is at least one container to test with. # We only validate the code execution with the provided image if there is at least one container to test with.
pool_size.positive? && docker_image.present? && !Rails.env.test? pool_size.positive? && docker_image.present? && !Rails.env.test? && Runner.management_active?
end end
def working_docker_image? def working_docker_image?
@ -105,7 +105,7 @@ class ExecutionEnvironment < ApplicationRecord
end end
def delete_runner_environment def delete_runner_environment
Runner.strategy_class.remove_environment(self) Runner.strategy_class.remove_environment(self) if Runner.management_active?
rescue Runner::Error => e rescue Runner::Error => e
unless errors.include?(:docker_image) unless errors.include?(:docker_image)
errors.add(:docker_image, "error: #{e}") errors.add(:docker_image, "error: #{e}")
@ -115,7 +115,7 @@ class ExecutionEnvironment < ApplicationRecord
def sync_runner_environment def sync_runner_environment
previous_saved_environment = self.class.find(id) previous_saved_environment = self.class.find(id)
Runner.strategy_class.sync_environment(previous_saved_environment) Runner.strategy_class.sync_environment(previous_saved_environment) if Runner.management_active?
rescue Runner::Error => e rescue Runner::Error => e
unless errors.include?(:docker_image) unless errors.include?(:docker_image)
errors.add(:docker_image, "error: #{e}") errors.add(:docker_image, "error: #{e}")