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

Do not create container if pooling is on and all containers are gone

Browse Source
This commit is contained in:
Jan Renz
2015-04-14 19:47:01 +02:00
parent 91ac7e8e37
commit 9187596f18
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/docker_container_pool.rb
View File

@ -17,7 +17,7 @@ class DockerContainerPool
end
def self.create_container(execution_environment)
DockerClient.create_container(execution_environment)
DockerClient.create_container(execution_environment)
end
def self.return_container(container, execution_environment)
@ -26,7 +26,7 @@ class DockerContainerPool
def self.get_container(execution_environment)
if config[:active]
@containers[execution_environment.id].try(:shift) || create_container(execution_environment)
@containers[execution_environment.id].try(:shift) || nil
else
create_container(execution_environment)
end
@ -49,6 +49,7 @@ class DockerContainerPool
def self.refill_for_execution_environment(execution_environment)
refill_count = [execution_environment.pool_size - @containers[execution_environment.id].length, config[:refill][:batch_size]].min
@containers[execution_environment.id] += refill_count.times.map { create_container(execution_environment) }
#refill_count.times.map { create_container(execution_environment) }
end
def self.start_refill_task