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

Prevent inactivityTimeout from being smaller than permitted_execution_time

Browse Source
This commit is contained in:
Sebastian Serth
2021-11-01 09:48:16 +01:00
parent bdfcb0da19
commit d16917261b
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/runner/strategy/docker_container_pool.rb
View File

@ -29,8 +29,9 @@ class Runner::Strategy::DockerContainerPool < Runner::Strategy
def self.request_from_management(environment) def self.request_from_management(environment)
url = "#{config[:url]}/docker_container_pool/get_container/#{environment.id}" url = "#{config[:url]}/docker_container_pool/get_container/#{environment.id}"
inactivity_timeout = [config[:unused_runner_expiration_time], environment.permitted_execution_time].max
body = { body = {
inactivity_timeout: config[:unused_runner_expiration_time].seconds, inactivity_timeout: inactivity_timeout.to_i.seconds,
} }
Rails.logger.debug { "#{Time.zone.now.getutc.inspect}: Requesting new runner at #{url}" } Rails.logger.debug { "#{Time.zone.now.getutc.inspect}: Requesting new runner at #{url}" }
response = Faraday.post url, body response = Faraday.post url, body
@ -191,8 +192,9 @@ class Runner::Strategy::DockerContainerPool < Runner::Strategy
def reset_inactivity_timer def reset_inactivity_timer
url = "#{self.class.config[:url]}/docker_container_pool/reuse_container/#{container.id}" url = "#{self.class.config[:url]}/docker_container_pool/reuse_container/#{container.id}"
inactivity_timeout = [self.class.config[:unused_runner_expiration_time], @execution_environment.permitted_execution_time].max
body = { body = {
inactivity_timeout: self.class.config[:unused_runner_expiration_time].seconds, inactivity_timeout: inactivity_timeout.to_i.seconds,
} }
Rails.logger.debug { "#{Time.zone.now.getutc.inspect}: Resetting inactivity timer at #{url}" } Rails.logger.debug { "#{Time.zone.now.getutc.inspect}: Resetting inactivity timer at #{url}" }
Faraday.post url, body Faraday.post url, body

3
lib/runner/strategy/poseidon.rb
View File

@ -33,9 +33,10 @@ class Runner::Strategy::Poseidon < Runner::Strategy
def self.request_from_management(environment) def self.request_from_management(environment)
url = "#{config[:url]}/runners" url = "#{config[:url]}/runners"
inactivity_timeout = [config[:unused_runner_expiration_time], environment.permitted_execution_time].max
body = { body = {
executionEnvironmentId: environment.id, executionEnvironmentId: environment.id,
inactivityTimeout: config[:unused_runner_expiration_time].seconds, inactivityTimeout: inactivity_timeout.to_i.seconds,
} }
Rails.logger.debug { "#{Time.zone.now.getutc.inspect}: Requesting new runner at #{url}" } Rails.logger.debug { "#{Time.zone.now.getutc.inspect}: Requesting new runner at #{url}" }
response = http_connection.post url, body.to_json response = http_connection.post url, body.to_json