puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 01:58:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

(MAINT) Remove Ping Check on Running VMs

Browse source 
Prior to this commit, a running VM could fail a ping check and be
destroyed. This causes issues when network hiccups occur or the machine
is performing a reboot.

A VM that is in a ready state will now be destroyed when handed back or
it hits the lifetime TTL.
This commit is contained in:
Colin 2015-10-02 13:02:38 -07:00
parent c5d0850dd1
commit 7b9b178861
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/vmpooler/pool_manager.rb
View file

@ -149,12 +149,6 @@ module Vmpooler
if host if host
queue_from, queue_to = 'running', 'completed' queue_from, queue_to = 'running', 'completed'
# Check that VM is powered on
if (host.runtime) &&
(host.runtime.powerState != 'poweredOn')
move_vm_queue(pool, vm, queue_from, queue_to, 'appears to be powered off or dead')
end
# Check that VM is within defined lifetime # Check that VM is within defined lifetime
checkouttime = $redis.hget('vmpooler__active__' + pool, vm) checkouttime = $redis.hget('vmpooler__active__' + pool, vm)
if checkouttime if checkouttime

6
spec/vmpooler/pool_manager_spec.rb
View file

@ -168,14 +168,14 @@ describe 'Pool Manager' do
context 'valid host' do context 'valid host' do
let(:vm_host) { double('vmhost') } let(:vm_host) { double('vmhost') }
it 'moves vm when not poweredOn' do it 'does not move vm when not poweredOn' do
allow(pool_helper).to receive(:find_vm).and_return vm_host allow(pool_helper).to receive(:find_vm).and_return vm_host
allow(vm_host).to receive(:runtime).and_return true allow(vm_host).to receive(:runtime).and_return true
allow(vm_host).to receive_message_chain(:runtime, :powerState).and_return 'poweredOff' allow(vm_host).to receive_message_chain(:runtime, :powerState).and_return 'poweredOff'
expect(redis).to receive(:hget) expect(redis).to receive(:hget)
expect(redis).to receive(:smove) expect(redis).not_to receive(:smove)
expect(logger).to receive(:log).with('d', "[!] [#{pool}] '#{vm}' appears to be powered off or dead") expect(logger).not_to receive(:log).with('d', "[!] [#{pool}] '#{vm}' appears to be powered off or dead")
subject._check_running_vm(vm, pool, timeout) subject._check_running_vm(vm, pool, timeout)
end end