Adding serial checking to avoid configuration conflict writing (Dashboard - Worker group configuration UI)

Author: DasFranck

mrq/dashboard/app.py

@@ -129,6 +129,9 @@ def get_workers():
 def get_workergroups():
     collection = connections.mongodb_jobs.mrq_workergroups
     data = {"workergroups": {str(row.pop("_id")): row for row in collection.find(sort=[("_id", 1)])}}
+    for workergroup_id in data["workergroups"]:
+        if "serial" not in data["workergroups"][workergroup_id]:
+            data["workergroups"][workergroup_id]["serial"] = str(int(time.time()))
     return jsonify(data)
 
 
@@ -144,9 +147,16 @@ def post_workergroups():
     for workergroup_id in workergroup_to_delete_list:
         connections.mongodb_jobs.mrq_workergroups.delete_one({"_id": workergroup_id})
 
+    outdated_wgcs = []
     for k, v in workergroups.iteritems():
-        connections.mongodb_jobs.mrq_workergroups.update_one({"_id": k}, {"$set": v}, upsert=True)
-    return jsonify({"status": "ok"})
+        if ("serial" not in v or v["serial"] == connections.mongodb_jobs.mrq_workergroups.find_one({"_id": k})["serial"]):
+            v["serial"] = str(int(time.time()))
+            connections.mongodb_jobs.mrq_workergroups.update_one({"_id": k}, {"$set": v}, upsert=True)
+        else:
+            outdated_wgcs.append(k)
+
+    return jsonify({"status": "outdated" if len(outdated_wgcs) else "ok",
+                    "outdated_wgcs": outdated_wgcs})
 
 
 def build_api_datatables_query(req):

mrq/dashboard/static/js/views/workergroups.js

@@ -56,6 +56,7 @@ define(["jquery", "underscore", "models", "views/generic/page", "quicksettings"]
       this.workergroupPanels.push(workerPanel);
       if (workergroup != null)
       {
+        this.serials[workergroupName] = workergroup["serial"]
         _.forEach(workergroup["profiles"], function(profile, profileName) {
           this.addProfileToPanel(workerPanel, profile, profileName);
         }, this);
@@ -79,19 +80,21 @@ define(["jquery", "underscore", "models", "views/generic/page", "quicksettings"]
     remove_profile: function() {
     },
 
-    reload: function() {
-      if (confirm('It will discard every changes that hasn\'t be saved. Are you sure?')) {
+    reload: function(force = false) {
+      if (force || confirm('It will discard every changes that hasn\'t be saved. Are you sure?')) {
         _.forEach(this.workergroupPanels, function(panel) {
-          if (panel != null && panel != undefined)
+          if (panel !== null && panel !== undefined)
             panel.destroy();
             delete panel;
         })
         this.render();
       }
     },
 
+
     // Check for "continue" usage instead of nested ifs
     save: function() {
+      var _this = this;
       this.commandPanel._controls["Status"].setValue("<font color=\"orange\">Saving...</font>");
 
       data = {};
@@ -106,9 +109,12 @@ define(["jquery", "underscore", "models", "views/generic/page", "quicksettings"]
               "profiles" : {},
               "process_termination_timeout": parseInt(panelJSON["Process Termination Timeout"], 10)
             }
+
+            if (panelJSON["Workgroup Name"] in _this.serials)
+              workergroup["serial"] = _this.serials[panelJSON["Workgroup Name"]];
+
             _.forEach(_.range(1, panel.profilesNumber + 1), function(index) {
               header = "Profile " + String(index) + " - ";
-              console.log(panelJSON[header + "Profile Name"])
               if ($.inArray(panelJSON[header + "Profile Name"], [null, ""]) == -1)
               {
                 profile = {};
@@ -124,21 +130,35 @@ define(["jquery", "underscore", "models", "views/generic/page", "quicksettings"]
           }
         }
       })
-      console.log(data)
 
       $.post("/api/workergroups", {"workergroups": JSON.stringify(data)}).done(function(result) {
-        if (result.status != "ok") {
+        if (result.status === "ok")
+        {
+          _this.commandPanel._controls["Status"].setValue("<font color=\"green\">Saved</font>");
+          _this.reload(true);
+        }
+        else if (result.status === "outdated")
+        {
+          string = "";
+          _.forEach(result.outdated_wgcs, function(wgc) {
+            string += "- " + wgc + "<br>";
+          })
+          _this.commandPanel._controls["Status"].setValue("<font color=\"red\">These configurations were outdated and were not saved:<br>" + string + "</font><br>The others were saved.");
+        }
+        else
+        {
+          _this.commandPanel._controls["Status"].setValue("<font color=\"red\">FAILED</font>");
           return alert("There was an error while saving!");
         }
       });
-      this.commandPanel._controls["Status"].setValue("<font color=\"green\">Saved</font>");
     },
 
     render: function() {
       var _this = this;
 
       this.workergroupPanels = [];
       this.addCommandPanel();
+      this.serials = {};
 
       $.get("/api/workergroups").done(function(data) {
         _.forEach(data["workergroups"], function(workergroup, workergroupName) {