Skip to content

Commit

Permalink
(POOLER-191) Add checking for running instances that are not in active
Browse files Browse the repository at this point in the history
This change adds detection of running instances that are in a running
queue, but have no data in a active queue for the same pool. When this
happens a machine will live forever, impacting the running count, and
preventing the machine from being killed. Without this change running
instances that are not marked as active will live forever.
  • Loading branch information
mattkirby committed Oct 13, 2020
1 parent 35104a7 commit 9d3eea2
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
16 changes: 6 additions & 10 deletions lib/vmpooler/pool_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -289,19 +289,15 @@ def _check_running_vm(vm, pool, ttl, provider)
move_vm_queue(pool, vm, 'running', 'completed', redis, "reached end of TTL after #{ttl} hours")
throw :stop_checking
end
else
move_vm_queue(pool, vm, 'running', 'completed', redis, "is listed as running, but has no checkouttime data. Removing from running")
end

if provider.vm_ready?(pool, vm)
throw :stop_checking
else
host = provider.get_vm(pool, vm)
throw :stop_checking if provider.vm_ready?(pool, vm)

if host
throw :stop_checking
else
move_vm_queue(pool, vm, 'running', 'completed', redis, 'is no longer in inventory, removing from running')
end
end
throw :stop_checking if provider.get_vm(pool, vm)

move_vm_queue(pool, vm, 'running', 'completed', redis, 'is no longer in inventory, removing from running')
end
end
end
Expand Down
12 changes: 10 additions & 2 deletions spec/unit/pool_manager_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -647,12 +647,20 @@
end

context 'valid host' do
it 'should not move VM if it has no checkout time' do
it 'should kill a VM if it has no checkout time' do
redis_connection_pool.with do |redis|
expect(provider).to receive(:vm_ready?).and_return(true)
expect(redis.sismember("vmpooler__running__#{pool}", vm)).to be(true)
subject._check_running_vm(vm, pool, 0, provider)
expect(redis.sismember("vmpooler__running__#{pool}", vm)).to be(true)
expect(redis.sismember("vmpooler__running__#{pool}", vm)).to be(false)
end
end

it 'should log a message when the machine is removed due to no active data' do
redis_connection_pool.with do |redis|
expect(provider).to receive(:vm_ready?).and_return(true)
expect(logger).to receive(:log).with('d',"[!] [#{pool}] '#{vm}' is listed as running, but has no checkouttime data. Removing from running")
subject._check_running_vm(vm, pool, 0, provider)
end
end

Expand Down

0 comments on commit 9d3eea2

Please sign in to comment.