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

Merge branch 'master' into maint/dont-require-fallback-config

Browse source
This commit is contained in:
Samuel 2020-10-09 14:54:29 -05:00 • committed by GitHub
commit ad8196970c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 63 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/vmfloaty/abs.rb
View file

@ -248,7 +248,7 @@ class ABS
conn = Http.get_conn(verbose, url)
conn.headers['X-AUTH-TOKEN'] = token if token
saved_job_id = DateTime.now.strftime('%Q')
saved_job_id = user + "-" + DateTime.now.strftime('%Q')
req_obj = {
:resources => os_types,
:job => {
@ -259,7 +259,7 @@ class ABS
},
}
if config['vmpooler_fallback']
if config['vmpooler_fallback'] # optional and not available as cli flag
vmpooler_config = Utils.get_vmpooler_service_config(config['vmpooler_fallback'])
# request with this token, on behalf of this user
req_obj[:vm_token] = vmpooler_config['token']
@ -288,15 +288,20 @@ class ABS
validate_queue_status_response(res.status, res.body, "Initial request", verbose)
(1..retries).each do |i|
queue_place, res_body = check_queue(conn, saved_job_id, req_obj, verbose)
return translated(res_body, saved_job_id) if res_body
begin
(1..retries).each do |i|
queue_place, res_body = check_queue(conn, saved_job_id, req_obj, verbose)
return translated(res_body, saved_job_id) if res_body
sleep_seconds = 10 if i >= 10
sleep_seconds = i if i < 10
FloatyLogger.info "Waiting #{sleep_seconds} seconds to check if ABS request has been filled. Queue Position: #{queue_place}... (x#{i})"
sleep_seconds = 10 if i >= 10
sleep_seconds = i if i < 10
FloatyLogger.info "Waiting #{sleep_seconds} seconds to check if ABS request has been filled. Queue Position: #{queue_place}... (x#{i})"
sleep(sleep_seconds)
sleep(sleep_seconds)
end
rescue SystemExit, Interrupt
FloatyLogger.info "\n\nFloaty interrupted, you can query the state of your request via\n1) `floaty query #{saved_job_id}` or delete it via\n2) `floaty delete #{saved_job_id}`"
exit 1
end
nil
end