Avoid racing, only hand over VMs after a successful smove

This commit is contained in:
Scott Schneider 2013-12-05 11:44:11 -08:00
parent 674a3eaf6f
commit c261baeb3b

View file

@ -62,9 +62,18 @@ post '/vm/:template' do
result[params[:template]]['error'] = 'You must specify a destination \'folder\' and \'pool\'' result[params[:template]]['error'] = 'You must specify a destination \'folder\' and \'pool\''
else else
if ( $redis.scard('vmware_host_pool__ready__'+params[:template]) > 0 ) if ( $redis.scard('vmware_host_pool__ready__'+params[:template]) > 0 )
vm = $redis.srandmember('vmware_host_pool__ready__'+params[:template]) vm = nil
$redis.srem('vmware_host_pool__ready__'+params[:template], vm)
$redis.sadd('vmware_host_pool__running__'+params[:template], vm) try = $redis.srandmember('vmware_host_pool__ready__'+params[:template])
if (
$redis.smove(
'vmware_host_pool__ready__'+params[:template],
'vmware_host_pool__running__'+params[:template],
try
)
)
vm = try
logger.log('s', "[<] '#{vm}' moved to 'running' queue") logger.log('s', "[<] '#{vm}' moved to 'running' queue")
@ -73,6 +82,9 @@ post '/vm/:template' do
else else
result[params[:template]]['ok'] = false result[params[:template]]['ok'] = false
end end
else
result[params[:template]]['ok'] = false
end
end end
JSON.pretty_generate(result) JSON.pretty_generate(result)