Skip to content

(maint) Add more uniqueness to jobid and useful termination message #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 9, 2020
Merged

(maint) Add more uniqueness to jobid and useful termination message #107

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0fac0b
(maint) Add more uniqueness to jobid
Oct 9, 2020
671623b
handle ctrl-c and term signal and return useful message on how
Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions lib/vmfloaty/abs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def self.retrieve(verbose, os_types, token, url, user, config, _ondemand = nil)
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')
vmpooler_config = Utils.get_vmpooler_service_config(config['vmpooler_fallback'])
req_obj = {
:resources => os_types,
Expand Down Expand Up @@ -284,15 +284,20 @@ def self.retrieve(verbose, os_types, token, url, user, config, _ondemand = nil)

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
Expand Down