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

Merge pull request #107 from puppetlabs/fix-jobid-uniqueness

Browse source 
(maint) Add more uniqueness to jobid and useful termination message
This commit is contained in:
Gene Liverman 2020-10-09 11:44:29 -04:00 • committed by GitHub
commit 221f6c18cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/vmfloaty/abs.rb
View file

@ -248,7 +248,7 @@ class ABS
conn = Http.get_conn(verbose, url) conn = Http.get_conn(verbose, url)
conn.headers['X-AUTH-TOKEN'] = token if token conn.headers['X-AUTH-TOKEN'] = token if token
saved_job_id = DateTime.now.strftime('%Q') saved_job_id = user + "-" + DateTime.now.strftime('%Q')
vmpooler_config = Utils.get_vmpooler_service_config(config['vmpooler_fallback']) vmpooler_config = Utils.get_vmpooler_service_config(config['vmpooler_fallback'])
req_obj = { req_obj = {
:resources => os_types, :resources => os_types,
@ -284,6 +284,7 @@ class ABS
validate_queue_status_response(res.status, res.body, "Initial request", verbose) validate_queue_status_response(res.status, res.body, "Initial request", verbose)
begin
(1..retries).each do |i| (1..retries).each do |i|
queue_place, res_body = check_queue(conn, saved_job_id, req_obj, verbose) queue_place, res_body = check_queue(conn, saved_job_id, req_obj, verbose)
return translated(res_body, saved_job_id) if res_body return translated(res_body, saved_job_id) if res_body
@ -294,6 +295,10 @@ class ABS
sleep(sleep_seconds) sleep(sleep_seconds)
end 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 nil
end end