mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 18:08:42 -05:00
Merge pull request #374 from puppetlabs/DIO-608
(DIO-608) vmpooler SUT handed out multiple times
This commit is contained in:
commit
9b41a542e9
1 changed files with 9 additions and 2 deletions
|
|
@ -83,8 +83,13 @@ module Vmpooler
|
||||||
vms.reverse.each do |vm|
|
vms.reverse.each do |vm|
|
||||||
ready = vm_ready?(vm, config['domain'])
|
ready = vm_ready?(vm, config['domain'])
|
||||||
if ready
|
if ready
|
||||||
backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__running__#{template_backend}", vm)
|
smoved = backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__running__#{template_backend}", vm)
|
||||||
return [vm, template_backend, template]
|
if smoved
|
||||||
|
return [vm, template_backend, template]
|
||||||
|
else
|
||||||
|
metrics.increment("checkout.smove.failed.#{template_backend}")
|
||||||
|
return [nil, nil, nil]
|
||||||
|
end
|
||||||
else
|
else
|
||||||
backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__completed__#{template_backend}", vm)
|
backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__completed__#{template_backend}", vm)
|
||||||
metrics.increment("checkout.nonresponsive.#{template_backend}")
|
metrics.increment("checkout.nonresponsive.#{template_backend}")
|
||||||
|
|
@ -874,6 +879,8 @@ module Vmpooler
|
||||||
|
|
||||||
status 200
|
status 200
|
||||||
result['ok'] = true
|
result['ok'] = true
|
||||||
|
else
|
||||||
|
metrics.increment('delete.srem.failed')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue