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

Cleanup

Browse Source
This commit is contained in:
Jan Renz
2015-04-23 13:12:44 +02:00
parent a5d5dde7a8
commit 7296ccda33
1 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/docker_container_pool.rb
View File

@ -3,7 +3,6 @@ require 'concurrent/timer_task'
require 'concurrent/utilities' require 'concurrent/utilities'
class DockerContainerPool class DockerContainerPool
TIME_TILL_RESTART = 900
@containers = ThreadSafe::Hash[ExecutionEnvironment.all.map { |execution_environment| [execution_environment.id, ThreadSafe::Array.new] }] @containers = ThreadSafe::Hash[ExecutionEnvironment.all.map { |execution_environment| [execution_environment.id, ThreadSafe::Array.new] }]
#as containers are not containing containers in use #as containers are not containing containers in use
@ -53,25 +52,9 @@ class DockerContainerPool
def self.get_container(execution_environment) def self.get_container(execution_environment)
if config[:active] if config[:active]
container = @containers[execution_environment.id].try(:shift) || nil container = @containers[execution_environment.id].try(:shift) || nil
if(!container.nil?) Rails.logger.info('get_container fetched container ' + container.to_s)
if ((Time.now - container.start_time).to_i.abs > TIME_TILL_RESTART) Rails.logger.info('get_container remaining avail. container ' + @containers[execution_environment.id].size.to_s)
# remove container from @all_containers Rails.logger.info('get_container all container count' + @all_containers[execution_environment.id].size.to_s)
Rails.logger.info('reinit container after time of life max ' + container.to_s)
remove_from_all_containers(container, execution_environment)
# destroy container
DockerClient.destroy_container(container)
# create new container and add it to @all_containers. will be added to @containers on return_container
container = create_container(execution_environment)
add_to_all_containers(container, execution_environment)
Rails.logger.info('new container is ' + container.to_s)
end
#container.status = 'used'
end
Rails.logger.info('fetched container ' + container.to_s)
Rails.logger.info('remaining avail. container ' + @containers[execution_environment.id].size.to_s)
Rails.logger.info('all container count' + @all_containers[execution_environment.id].size.to_s)
container container
else else
create_container(execution_environment) create_container(execution_environment)