external/proxstar
1
0
Fork 0
mirror of https://github.com/ComputerScienceHouse/proxstar.git synced 2025-02-14 14:01:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #35 from MasterChief-John-117/fix-templates

Browse source 
Increase timeout and fix infinite loop if starrs delete fails
This commit is contained in:
Max Meinhold 2020-01-15 22:28:17 -05:00 committed by GitHub
commit f734894dbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
proxstar/tasks.py
View file

@ -99,7 +99,10 @@ def delete_vm_task(vmid):
while retry < 3: while retry < 3:
try: try:
delete_starrs(starrs, vm.name) delete_starrs(starrs, vm.name)
break
except: except:
retry += 1
time.sleep(3)
continue continue
if vm.status != 'stopped': if vm.status != 'stopped':
vm.stop() vm.stop()
@ -167,12 +170,12 @@ def setup_template_task(template_id, name, user, ssh_key, cores, memory):
logging.info( logging.info(
'[{}] Waiting until Proxmox is done provisioning.'.format(name)) '[{}] Waiting until Proxmox is done provisioning.'.format(name))
set_job_status(job, 'waiting for Proxmox') set_job_status(job, 'waiting for Proxmox')
timeout = 20 timeout = 25
retry = 0 retry = 0
while retry < timeout: while retry < timeout:
if not VM(vmid).is_provisioned(): if not VM(vmid).is_provisioned():
retry += 1 retry += 1
time.sleep(6) time.sleep(12)
continue continue
break break
if retry == timeout: if retry == timeout: