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

Remove @all_containers instead of @containers during cleanup

Browse Source 
Also added some comments and todos
Also fixed debug messages in remove_from_all_containers
Also refactored duplicated code with extracted function
Also removed some commented lines of code
This commit is contained in:
Tom Staubitz
2015-12-12 00:41:26 +08:00
parent e335759644
commit 943d5554d9
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/docker_container_pool.rb
View File

@ -9,12 +9,13 @@ class DockerContainerPool
@all_containers = ThreadSafe::Hash[ExecutionEnvironment.all.map { |execution_environment| [execution_environment.id, ThreadSafe::Array.new] }]
def self.clean_up
@refill_task.try(:shutdown)
@containers.values.each do |containers|
@all_containers.values.each do |containers|
DockerClient.destroy_container(containers.shift) until containers.empty?
end
end
def self.config
#TODO: Why erb?
@config ||= CodeOcean::Config.new(:docker).read(erb: true)[:pool]
end
@ -28,9 +29,11 @@ class DockerContainerPool
def self.remove_from_all_containers(container, execution_environment)
@all_containers[execution_environment.id]-=[container]
Rails.logger.debug('Removed container ' + container.to_s + ' from all_pool for execution environment ' + execution_environment.to_s + '. Remaining containers in all_pool ' + @all_containers[execution_environment.id].size.to_s)
if(@containers[execution_environment.id].include?(container))
@containers[execution_environment.id]-=[container]
Rails.logger.debug('Removed container ' + container.to_s + ' from all_pool for execution environment ' + execution_environment.to_s + '. Remaining containers in all_pool ' + @all_containers[execution_environment.id].size.to_s)
Rails.logger.debug('Removed container ' + container.to_s + ' from available_pool for execution environment ' + execution_environment.to_s + '. Remaining containers in available_pool ' + @containers[execution_environment.id].size.to_s)
end
end
@ -75,17 +78,12 @@ class DockerContainerPool
Rails.logger.debug('get_container all container count: ' + @all_containers[execution_environment.id].size.to_s)
else
Rails.logger.error('docker_container_pool.get_container retrieved a container not running. Container will be removed from list: ' + container.to_s)
remove_from_all_containers(container, execution_environment)
Rails.logger.error('Creating a new container and returning that.')
container = create_container(execution_environment)
DockerContainerPool.add_to_all_containers(container, execution_environment)
#TODO: check in which state the container actually is and treat it accordingly (dead,... => destroy?)
container = replace_broken_container(container, execution_environment)
end
rescue Docker::Error::NotFoundError => error
Rails.logger.error('docker_container_pool.get_container rescued from Docker::Error::NotFoundError. Most likely, the container is not there any longer. Removing faulty entry from list: ' + container.to_s)
remove_from_all_containers(container, execution_environment)
Rails.logger.error('Creating a new container and returning that.')
container = create_container(execution_environment)
DockerContainerPool.add_to_all_containers(container, execution_environment)
container = replace_broken_container(container, execution_environment)
end
end
# returning nil is no problem. then the pool is just depleted.
@ -95,6 +93,14 @@ class DockerContainerPool
end
end
def self.replace_broken_container(container, execution_environment)
remove_from_all_containers(container, execution_environment)
Rails.logger.error('Creating a new container and returning that.')
new_container = create_container(execution_environment)
DockerContainerPool.add_to_all_containers(new_container, execution_environment)
new_container
end
def self.quantities
@containers.map { |key, value| [key, value.length] }.to_h
end
@ -115,14 +121,11 @@ class DockerContainerPool
Rails.logger.info('Adding ' + refill_count.to_s + ' containers for execution_environment ' + execution_environment.name )
c = refill_count.times.map { create_container(execution_environment) }
Rails.logger.info('Created containers: ' + c.to_s )
#c.each { |container| return_container(container, execution_environment) }
@containers[execution_environment.id] += c
@all_containers[execution_environment.id] += c
Rails.logger.debug('@containers for ' + execution_environment.name.to_s + ' (' + @containers.object_id.to_s + ') has the following content: '+ @containers[execution_environment.id].to_s)
Rails.logger.debug('@all_containers for ' + execution_environment.name.to_s + ' (' + @all_containers.object_id.to_s + ') has the following content: ' + @all_containers[execution_environment.id].to_s)
#refill_count.times.map { create_container(execution_environment) }
end
end
def self.start_refill_task