add retries everywhere cuz proxmox sucks, use json for iso list (for marc <3)

Author: com6056

proxstar/__init__.py

@@ -1,4 +1,5 @@
 import os
+import json
 import time
 import psutil
 import atexit
@@ -157,7 +158,7 @@ def list_vms(user_view=None):
 def isos():
     proxmox = connect_proxmox()
     isos = get_isos(proxmox, app.config['PROXMOX_ISO_STORAGE'])
-    return ','.join(isos)
+    return json.dumps({"isos": isos})
 
 
 @app.route("/hostname/<string:name>")

proxstar/static/js/script.js

@@ -171,12 +171,11 @@ $("#change-iso").click(function(){
     fetch(`/isos`, {
         credentials: 'same-origin',
     }).then((response) => {
-        return response.text()
-    }).then((text) => {
-        var isos = text.split(',');
+        return response.json()
+    }).then((json) => {
         var iso_list = document.createElement('select');
-        for (i = 0; i < isos.length; i++) {
-            iso_list.appendChild(new Option(isos[i], isos[i]));
+        for (i = 0; i < json.isos.length; i++) {
+            iso_list.appendChild(new Option(json.isos[i], json.isos[i]));
         }
         swal({
             title: 'Choose an ISO to mount:',

proxstar/tasks.py

@@ -133,6 +133,9 @@ def setup_template_task(template_id, name, user, ssh_key, cores, memory):
         ip = get_next_ip(starrs, app.config['STARRS_IP_RANGE'])
         register_starrs(starrs, name, app.config['STARRS_USER'], mac, ip)
         get_vm_expire(db, vmid, app.config['VM_EXPIRE_MONTHS'])
+        print("[{}] Giving Proxmox some time to finish cloning.".format(name))
+        job.meta['status'] = 'waiting for Proxmox'
+        time.sleep(15)
         print("[{}] Setting CPU and memory.".format(name))
         job.meta['status'] = 'setting CPU and memory'
         job.save_meta()

proxstar/vm.py

@@ -1,6 +1,7 @@
 import time
 import json
 import urllib
+from tenacity import retry, wait_fixed, stop_after_attempt
 from proxstar import db, starrs
 from proxstar.db import get_vm_expire
 from proxstar.util import lazy_property
@@ -43,39 +44,48 @@ def node(self):
             if vm['vmid'] == int(self.id):
                 return vm['node']
 
+    @retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
     def delete(self):
         proxmox = connect_proxmox()
         proxmox.nodes(self.node).qemu(self.id).delete()
 
+    @retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
     def set_cpu(self, cores):
         proxmox = connect_proxmox()
         proxmox.nodes(self.node).qemu(self.id).config.put(
             cores=cores, sockets=1)
 
+    @retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
     def set_mem(self, mem):
         proxmox = connect_proxmox()
         proxmox.nodes(self.node).qemu(self.id).config.put(memory=mem)
 
+    @retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
     def start(self):
         proxmox = connect_proxmox()
         proxmox.nodes(self.node).qemu(self.id).status.start.post()
 
+    @retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
     def stop(self):
         proxmox = connect_proxmox()
         proxmox.nodes(self.node).qemu(self.id).status.stop.post()
 
+    @retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
     def shutdown(self):
         proxmox = connect_proxmox()
         proxmox.nodes(self.node).qemu(self.id).status.shutdown.post()
 
+    @retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
     def reset(self):
         proxmox = connect_proxmox()
         proxmox.nodes(self.node).qemu(self.id).status.reset.post()
 
+    @retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
     def suspend(self):
         proxmox = connect_proxmox()
         proxmox.nodes(self.node).qemu(self.id).status.suspend.post()
 
+    @retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
     def resume(self):
         proxmox = connect_proxmox()
         proxmox.nodes(self.node).qemu(self.id).status.resume.post()
@@ -108,6 +118,7 @@ def boot_order(self):
     def boot_order_json(self):
         return json.dumps(self.boot_order)
 
+    @retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
     def set_boot_order(self, boot_order):
         proxmox = connect_proxmox()
         boot_order_lookup = {
@@ -184,11 +195,13 @@ def start_vnc(self, port):
         proxmox.nodes(self.node).qemu(self.id).monitor.post(
             command="change vnc 127.0.0.1:{}".format(port))
 
+    @retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
     def eject_iso(self):
         proxmox = connect_proxmox()
         proxmox.nodes(self.node).qemu(
             self.id).config.post(ide2='none,media=cdrom')
 
+    @retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
     def mount_iso(self, iso):
         proxmox = connect_proxmox()
         proxmox.nodes(self.node).qemu(
@@ -203,15 +216,18 @@ def resize_disk(self, disk, size):
     def expire(self):
         return get_vm_expire(db, self.id, app.config['VM_EXPIRE_MONTHS'])
 
+    @retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
     def set_ci_user(self, user):
         proxmox = connect_proxmox_ssh()
         proxmox.nodes(self.node).qemu(self.id).config.put(ciuser=user)
 
+    @retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
     def set_ci_ssh_key(self, ssh_key):
         proxmox = connect_proxmox_ssh()
         escaped_key = urllib.parse.quote(ssh_key, safe='')
         proxmox.nodes(self.node).qemu(self.id).config.put(sshkey=escaped_key)
 
+    @retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
     def set_ci_network(self):
         proxmox = connect_proxmox_ssh()
         proxmox.nodes(self.node).qemu(self.id).config.put(ipconfig0='ip=dhcp')
@@ -232,7 +248,7 @@ def create_vm(proxmox, user, name, cores, memory, disk, iso):
         pool=user,
         description='Managed by Proxstar')
     retry = 0
-    while retry < 5:
+    while retry < 20:
         try:
             mac = VM(vmid).get_mac()
             break
@@ -254,7 +270,7 @@ def clone_vm(proxmox, template_id, name, pool):
         description='Managed by Proxstar',
         target=target)
     retry = 0
-    while retry < 60:
+    while retry < 100:
         try:
             mac = VM(newid).get_mac()
             break

requirements.txt

@@ -15,3 +15,4 @@ sshtunnel
 psutil
 requests
 rq_dashboard
+tenacity