mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 01:58:41 -05:00
(POOLER-158) Add capability to provision VMs on demand
This change adds a capability to vmpooler to provision instances on demand. Without this change vmpooler only supports retrieving machines from pre-provisioned pools. Additionally, this change refactors redis interactions to reduce round trips to redis. Specifically, multi and pipelined redis commands are added where possible to reduce the number of times we are calling redis. To support the redis refactor the redis interaction has changed to leveraging a connection pool. In addition to offering multiple connections for pool manager to use, the redis interactions in pool manager are now thread safe. Ready TTL is now a global parameter that can be set as a default for all pools. A default of 0 has been removed, because this is an unreasonable default behavior, which would leave a provisioned instance in the pool indefinitely. Pool empty messages have been removed when the pool size is set to 0. Without this change, when a pool was set to a size of 0 the API and pool manager would both show that a pool is empty.
This commit is contained in:
parent
1f6f08d172
commit
811fd8b60f
34 changed files with 3326 additions and 1098 deletions
|
|
@ -128,7 +128,7 @@ describe Vmpooler::API::Helpers do
|
|||
]
|
||||
|
||||
allow(redis).to receive(:pipelined).with(no_args).and_return [1,1]
|
||||
allow(redis).to receive(:get).and_return 1
|
||||
allow(redis).to receive(:get).and_return(1,0)
|
||||
|
||||
expect(subject.get_queue_metrics(pools, redis)).to eq({pending: 2, cloning: 1, booting: 1, ready: 2, running: 2, completed: 2, total: 8})
|
||||
end
|
||||
|
|
@ -140,7 +140,7 @@ describe Vmpooler::API::Helpers do
|
|||
]
|
||||
|
||||
allow(redis).to receive(:pipelined).with(no_args).and_return [1,1]
|
||||
allow(redis).to receive(:get).and_return 5
|
||||
allow(redis).to receive(:get).and_return(5,0)
|
||||
|
||||
expect(subject.get_queue_metrics(pools, redis)).to eq({pending: 2, cloning: 5, booting: 0, ready: 2, running: 2, completed: 2, total: 8})
|
||||
end
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -22,7 +22,9 @@ describe 'Vmpooler::PoolManager::Provider::Base' do
|
|||
fake_vm
|
||||
}
|
||||
|
||||
subject { Vmpooler::PoolManager::Provider::Base.new(config, logger, metrics, provider_name, provider_options) }
|
||||
let(:redis_connection_pool) { ConnectionPool.new(size: 1) { MockRedis.new } }
|
||||
|
||||
subject { Vmpooler::PoolManager::Provider::Base.new(config, logger, metrics, redis_connection_pool, provider_name, provider_options) }
|
||||
|
||||
# Helper attr_reader methods
|
||||
describe '#logger' do
|
||||
|
|
|
|||
|
|
@ -91,7 +91,9 @@ EOT
|
|||
)
|
||||
}
|
||||
|
||||
subject { Vmpooler::PoolManager::Provider::Dummy.new(config, logger, metrics, 'dummy', provider_options) }
|
||||
let(:redis_connection_pool) { ConnectionPool.new(size: 1) { MockRedis.new } }
|
||||
|
||||
subject { Vmpooler::PoolManager::Provider::Dummy.new(config, logger, metrics, redis_connection_pool, 'dummy', provider_options) }
|
||||
|
||||
describe '#name' do
|
||||
it 'should be dummy' do
|
||||
|
|
|
|||
|
|
@ -77,9 +77,15 @@ EOT
|
|||
let(:connection_options) {{}}
|
||||
let(:connection) { mock_RbVmomi_VIM_Connection(connection_options) }
|
||||
let(:vmname) { 'vm1' }
|
||||
let(:redis) { MockRedis.new }
|
||||
let(:redis_connection_pool) { Vmpooler::PoolManager::GenericConnectionPool.new(
|
||||
metrics: metrics,
|
||||
metric_prefix: 'redis_connection_pool',
|
||||
size: 1,
|
||||
timeout: 5
|
||||
) { MockRedis.new }
|
||||
}
|
||||
|
||||
subject { Vmpooler::PoolManager::Provider::VSphere.new(config, logger, metrics, 'vsphere', provider_options) }
|
||||
subject { Vmpooler::PoolManager::Provider::VSphere.new(config, logger, metrics, redis_connection_pool, 'vsphere', provider_options) }
|
||||
|
||||
before(:each) do
|
||||
allow(subject).to receive(:vsphere_connection_ok?).and_return(true)
|
||||
|
|
@ -149,26 +155,19 @@ EOT
|
|||
allow(destroy_task).to receive(:wait_for_completion)
|
||||
allow(vm_object).to receive(:PowerOffVM_Task).and_return(power_off_task)
|
||||
allow(vm_object).to receive(:Destroy_Task).and_return(destroy_task)
|
||||
$redis = redis
|
||||
end
|
||||
|
||||
it 'should remove redis data and expire the vm key' do
|
||||
allow(Time).to receive(:now).and_return(now)
|
||||
expect(redis).to receive(:srem).with("vmpooler__completed__#{pool}", vmname)
|
||||
expect(redis).to receive(:hdel).with("vmpooler__active__#{pool}", vmname)
|
||||
expect(redis).to receive(:hset).with("vmpooler__vm__#{vmname}", 'destroy', now)
|
||||
expect(redis).to receive(:expire).with("vmpooler__vm__#{vmname}", data_ttl * 60 * 60)
|
||||
|
||||
subject.destroy_vm_and_log(vmname, vm_object, pool, data_ttl)
|
||||
end
|
||||
|
||||
it 'should log a message that the vm is destroyed' do
|
||||
# Ensure Time returns a consistent value so finish is predictable
|
||||
# Otherwise finish occasionally increases to 0.01 and causes a failure
|
||||
allow(Time).to receive(:now).and_return(Time.now)
|
||||
expect(logger).to receive(:log).with('s', "[-] [#{pool}] '#{vmname}' destroyed in #{finish} seconds")
|
||||
|
||||
subject.destroy_vm_and_log(vmname, vm_object, pool, data_ttl)
|
||||
end
|
||||
|
||||
it 'should record metrics' do
|
||||
expect(metrics).to receive(:timing).with('redis_connection_pool.waited', 0)
|
||||
expect(metrics).to receive(:timing).with("destroy.#{pool}", finish)
|
||||
|
||||
subject.destroy_vm_and_log(vmname, vm_object, pool, data_ttl)
|
||||
|
|
@ -647,6 +646,18 @@ EOT
|
|||
end
|
||||
end
|
||||
|
||||
context 'when create_vm_folder returns nil' do
|
||||
before(:each) do
|
||||
template_vm = new_template_object
|
||||
allow(subject).to receive(:find_template_vm).and_return(new_template_object)
|
||||
expect(subject).to receive(:find_vm_folder).and_return(nil)
|
||||
end
|
||||
|
||||
it 'should raise an error' do
|
||||
expect{ subject.create_vm(poolname, vmname) }.to raise_error(ArgumentError)
|
||||
end
|
||||
end
|
||||
|
||||
context 'Given a successful creation' do
|
||||
let(:folder_object) { mock_RbVmomi_VIM_Folder({ :name => 'pool1'}) }
|
||||
before(:each) do
|
||||
|
|
@ -2573,10 +2584,12 @@ EOT
|
|||
subject.connection_pool.with_metrics do |pool_object|
|
||||
expect(subject).to receive(:ensured_vsphere_connection).with(pool_object).and_return(connection)
|
||||
expect(subject).to receive(:get_vm_details).and_return(vm_details)
|
||||
allow($redis).to receive(:hset)
|
||||
expect(subject).to receive(:run_select_hosts).with(poolname, {})
|
||||
expect(subject).to receive(:vm_in_target?).and_return false
|
||||
expect(subject).to receive(:migration_enabled?).and_return true
|
||||
redis_connection_pool.with do |redis|
|
||||
redis.hset("vmpooler__vm__#{vmname}", 'checkout', Time.now)
|
||||
end
|
||||
end
|
||||
vm_object.summary.runtime.host = host_object
|
||||
end
|
||||
|
|
@ -2585,7 +2598,6 @@ EOT
|
|||
expect(subject).to receive(:select_next_host).and_return(new_host)
|
||||
expect(subject).to receive(:find_host_by_dnsname).and_return(new_host_object)
|
||||
expect(subject).to receive(:migrate_vm_host).with(vm_object, new_host_object)
|
||||
expect($redis).to receive(:hget).with("vmpooler__vm__#{vmname}", 'checkout').and_return((Time.now - 1).to_s)
|
||||
expect(logger).to receive(:log).with('s', "[>] [#{poolname}] '#{vmname}' migrated from #{parent_host} to #{new_host} in 0.00 seconds")
|
||||
|
||||
subject.migrate_vm(poolname, vmname)
|
||||
|
|
@ -2603,7 +2615,6 @@ EOT
|
|||
subject.connection_pool.with_metrics do |pool_object|
|
||||
expect(subject).to receive(:ensured_vsphere_connection).with(pool_object).and_return(connection)
|
||||
expect(subject).to receive(:get_vm_details).and_return(vm_details)
|
||||
expect($redis).to receive(:hset).with("vmpooler__vm__#{vmname}", 'host', parent_host)
|
||||
expect(subject).to receive(:run_select_hosts).with(poolname, {})
|
||||
expect(subject).to receive(:vm_in_target?).and_return true
|
||||
expect(subject).to receive(:migration_enabled?).and_return true
|
||||
|
|
@ -2622,11 +2633,13 @@ EOT
|
|||
before(:each) do
|
||||
subject.connection_pool.with_metrics do |pool_object|
|
||||
expect(subject).to receive(:ensured_vsphere_connection).with(pool_object).and_return(connection)
|
||||
expect($redis).to receive(:scard).with('vmpooler__migration').and_return(5)
|
||||
expect(subject).to receive(:get_vm_details).and_return(vm_details)
|
||||
expect(subject).to_not receive(:run_select_hosts)
|
||||
expect(subject).to_not receive(:vm_in_target?)
|
||||
expect(subject).to receive(:migration_enabled?).and_return true
|
||||
redis_connection_pool.with do |redis|
|
||||
expect(redis).to receive(:scard).with('vmpooler__migration').and_return(5)
|
||||
end
|
||||
end
|
||||
vm_object.summary.runtime.host = host_object
|
||||
end
|
||||
|
|
@ -2691,14 +2704,10 @@ EOT
|
|||
end
|
||||
|
||||
it' migrates a vm' do
|
||||
expect($redis).to receive(:sadd).with('vmpooler__migration', vmname)
|
||||
expect(subject).to receive(:select_next_host).and_return(new_host)
|
||||
expect($redis).to receive(:hset).with("vmpooler__vm__#{vmname}", 'host', new_host)
|
||||
expect($redis).to receive(:hset).with("vmpooler__vm__#{vmname}", 'migrated', true)
|
||||
expect(subject).to receive(:find_host_by_dnsname).and_return(new_host_object)
|
||||
expect(subject).to receive(:migrate_vm_and_record_timing).and_return(format('%.2f', (Time.now - (Time.now - 15))))
|
||||
expect(logger).to receive(:log).with('s', "[>] [#{poolname}] '#{vmname}' migrated from host1 to host2 in 15.00 seconds")
|
||||
expect($redis).to receive(:srem).with('vmpooler__migration', vmname)
|
||||
subject.migrate_vm_to_new_host(poolname, vmname, vm_details, connection)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue