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

(maint) Fail in ABS when queue requests don't return 200/202

Browse source 
When ABS returns an http status code other than 200 or 202, the ABS code
should fail
This commit is contained in:
Sean P. McDonald 2020-08-11 15:09:58 -05:00
parent d22e2b4194
commit 1eaa80706c
No known key found for this signature in database
GPG key ID: 9AA99070A3B24BB3
1 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/vmfloaty/abs.rb
View file

@ -229,10 +229,10 @@ class ABS
retries = 360 retries = 360
raise AuthError, "HTTP #{res.status}: The token provided could not authenticate to the pooler.\n#{res_body}" if res.status == 401 validate_queue_status_response(res.status, res.body, "Initial request", verbose)
(1..retries).each do |i| (1..retries).each do |i|
queue_place, res_body = check_queue(conn, saved_job_id, req_obj) queue_place, res_body = check_queue(conn, saved_job_id, req_obj, verbose)
return translated(res_body) if res_body return translated(res_body) if res_body
sleep_seconds = 10 if i >= 10 sleep_seconds = 10 if i >= 10
@ -262,11 +262,12 @@ class ABS
vmpooler_formatted_body vmpooler_formatted_body
end end
def self.check_queue(conn, job_id, req_obj) def self.check_queue(conn, job_id, req_obj, verbose)
queue_info_res = conn.get "status/queue/info/#{job_id}" queue_info_res = conn.get "status/queue/info/#{job_id}"
queue_info = JSON.parse(queue_info_res.body) queue_info = JSON.parse(queue_info_res.body)
res = conn.post 'request', req_obj.to_json res = conn.post 'request', req_obj.to_json
validate_queue_status_response(res.status, res.body, "Check queue request", verbose)
unless res.body.empty? unless res.body.empty?
res_body = JSON.parse(res.body) res_body = JSON.parse(res.body)
@ -315,4 +316,21 @@ class ABS
def self.revert(_verbose, _url, _hostname, _token, _snapshot_sha) def self.revert(_verbose, _url, _hostname, _token, _snapshot_sha)
raise NoMethodError, 'revert is not defined for ABS' raise NoMethodError, 'revert is not defined for ABS'
end end
# Validate the http code returned during a queue status request.
#
# Return a success message that can be displayed if the status code is
# success, otherwise raise an error.
def self.validate_queue_status_response(status_code, body, request_name, verbose)
case status_code
when 200
"#{request_name} returned success (Code 200)" if verbose
when 202
"#{request_name} returned accepted, processing (Code 202)" if verbose
when 401
raise AuthError, "HTTP #{status_code}: The token provided could not authenticate.\n#{body}"
else
raise "HTTP #{status_code}: #{request_name} request to ABS failed!\n#{body}"
end
end
end end