ext6migrate: add unqueue to UpdateQueue

in the event of a destroyed or stopped object/updateStore,
we do not want to execute queued requests, thus we
need to unqueue them

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/www/manager6/data/UpdateQueue.js b/www/manager6/data/UpdateQueue.js
index 121aba68e2042d6e68b54cb73fa7e486faa3260d..d8c27980b62c7ddf1e43844ef2352225bbf47d7f 100644 (file)
--- a/www/manager6/data/UpdateQueue.js
+++ b/www/manager6/data/UpdateQueue.js
@@ -51,6 +51,16 @@ Ext.define('PVE.data.UpdateQueue', {
                    queue.push(storeid);
                }
                start_update();
+           },
+           unqueue: function(store) {
+               var storeid = store.storeid;
+               if (!storeid) {
+                   throw "unabel to unqueue store without storeid";
+               }
+               if (queue_idx[storeid]) {
+                   Ext.Array.remove(queue,storeid);
+                   queue_idx[storeid] = null;
+               }
            }
        });
     }

diff --git a/www/manager6/data/UpdateStore.js b/www/manager6/data/UpdateStore.js
index 72683fec70a513a1a0edeaf6e0d1997b7defd8b4..7208a4f8e69044011935962ab757ff06cb78c5b3 100644 (file)
--- a/www/manager6/data/UpdateStore.js
+++ b/www/manager6/data/UpdateStore.js
@@ -42,6 +42,7 @@ Ext.define('PVE.data.UpdateStore', {
            },
            stopUpdate: function() {
                load_task.cancel();
+               PVE.data.UpdateQueue.unqueue(me);
            }
        });
 
@@ -49,6 +50,7 @@ Ext.define('PVE.data.UpdateStore', {
 
        me.on('destroy', function() {
            load_task.cancel();
+           PVE.data.UpdateQueue.unqueue(me);
        });
     }
 });