Skip to content

Commit

Permalink
Update find_least_used_compatible_host to specify pool
Browse files Browse the repository at this point in the history
This commit updates find_least_used_compatible_host method to specify
the pool name when evaluating a VM for migration. Without this change VM
migration fails with a wrong number of arguments error. Pool_manager
test references are updated to reflect the change.
  • Loading branch information
mattkirby committed Jun 27, 2017
1 parent e5d2844 commit 8c6f870
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/vmpooler/pool_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ def _migrate_vm(vm_name, pool_name, provider)
return
else
$redis.sadd('vmpooler__migration', vm_name)
host_name = provider.find_least_used_compatible_host(vm_name)
host_name = provider.find_least_used_compatible_host(pool_name, vm_name)
if host_name == parent_host_name
$logger.log('s', "[ ] [#{pool_name}] No migration required for '#{vm_name}' running on #{parent_host_name}")
else
Expand Down
4 changes: 2 additions & 2 deletions spec/unit/pool_manager_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1619,7 +1619,7 @@

context 'and host to migrate to is the same as the current host' do
before(:each) do
expect(provider).to receive(:find_least_used_compatible_host).with(vm).and_return(vm_parent_hostname)
expect(provider).to receive(:find_least_used_compatible_host).with(pool ,vm).and_return(vm_parent_hostname)
end

it "should not migrate the VM" do
Expand Down Expand Up @@ -1648,7 +1648,7 @@
context 'and host to migrate to different to the current host' do
let(:vm_new_hostname) { 'new_hostname' }
before(:each) do
expect(provider).to receive(:find_least_used_compatible_host).with(vm).and_return(vm_new_hostname)
expect(provider).to receive(:find_least_used_compatible_host).with(pool, vm).and_return(vm_new_hostname)
expect(subject).to receive(:migrate_vm_and_record_timing).with(vm, pool, vm_parent_hostname, vm_new_hostname, provider).and_return('1.00')
end

Expand Down

0 comments on commit 8c6f870

Please sign in to comment.