Fix merge conflict: restore working noiseScript string templates in hot_backup_views, hot_backup_aql, and hot_backup_load

cpjulia · cpjulia · commit 3f236f6a4504 · 2025-12-04T01:05:25.000-03:00
The merge from devel (commit 0f2dd6a) incorrectly replaced the working string template versions with broken function closure versions in three additional tests: hot_backup_views, hot_backup_aql, and hot_backup_load. Function closures don't work when serialized to a separate process, causing 'ReferenceError' errors and cluster backend connection failures. Restore the working string template versions for all three tests.
diff --git a/js/client/modules/@arangodb/testsuites/hotbackup.js b/js/client/modules/@arangodb/testsuites/hotbackup.js
@@ -253,25 +253,25 @@ function hotBackup_views (options) {
   let which = "hot_backup_views";
   return hotBackup_load_backend(options, which, {
     // Insert documents into test_collection:
-    noiseScript: function () {
-      let i=0;
-      while(true) {
-        console.log('Noise starts');
-        try {
-          db._useDatabase('test_view');
-          for (; i < 10000; i++) {
-            db.test_collection.insert({"number": i, "field1": "stone"});
-          }
-          print('done');
-          break;
-        }
-        catch (ex) {
-          console.log(ex);
-          break;
-        }
-        return 0;
-      }
-    },
+    noiseScript: `
+let i=0;
+while(true) {
+  console.log('Noise starts');
+  try {
+    db._useDatabase('test_view');
+    for (; i < 10000; i++) {
+      db.test_collection.insert({"number": i, "field1": "stone"});
+    }
+    print('done');
+    break;
+  }
+  catch (ex) {
+    console.log(ex);
+    break;
+  }
+  return 0;
+}
+`,
     noiseVolume: 1,
     // :/ making sure that something has happened from the
     // inserter thread
@@ -377,25 +377,25 @@ function hotBackup_aql (options) {
 
   let which = "hot_backup_aql";
   return hotBackup_load_backend(options, which, {
-    noiseScript: function () {
-      const errors = require('internal').errors;
-      while (true) {
-        try {
-          db._query("FOR i IN 1..1000 INSERT {thrd: @idx, i} INTO test_collection",
-                    {"idx": `${idx}`}).toArray();
-        } catch (ex) {
-          if (ex.errorNum === errors.ERROR_SHUTTING_DOWN.code ||
-              ex.errorNum === errors.ERROR_SIMPLE_CLIENT_COULD_NOT_CONNECT.code) {
-            break;
-          }
-          else {
-            console.error(ex);
-            throw ex;
-          }
-        }
-      }
-      return 0;
-    },
+    noiseScript: `
+const errors = require('internal').errors;
+while (true) {
+  try {
+    db._query("FOR i IN 1..1000 INSERT {thrd: @idx, i} INTO test_collection",
+              {"idx": idx}).toArray();
+  } catch (ex) {
+    if (ex.errorNum === errors.ERROR_SHUTTING_DOWN.code ||
+        ex.errorNum === errors.ERROR_SIMPLE_CLIENT_COULD_NOT_CONNECT.code) {
+      break;
+    }
+    else {
+      console.error(ex);
+      throw ex;
+    }
+  }
+}
+return 0;
+`,
     noiseVolume: 20,
     noiseDuration: 15,
     preRestoreFn: function() {
@@ -435,42 +435,42 @@ function hotBackup_smart_graphs (options) {
 
   let which = "hot_backup_load";
   return hotBackup_load_backend(options, which, {
-    noiseScript: function() {
-      db._useDatabase('test');
-      const errors = require('internal').errors;
-      function shuffleArray(array) {
-        for (let i = array.length - 1; i > 0; i--) {
-          const j = Math.floor(Math.random() * (i + 1));
-          [array[i], array[j]] = [array[j], array[i]];
-        }
-      }
-      let ids1 = [...Array(20).keys()];
-      let ids2 = [...Array(20).keys()];
-      while(true) {
-        shuffleArray(ids1);
-        shuffleArray(ids2);
-        let edge_docs = [];
-        for (let i = 0; i < 20; i++) {
-          edge_docs.push({
-            "_from": `foo/${ids1[i]}:v${ids1[i]}`,
-            "_to": `foo/${ids2[i]}:v${ids2[i]}`,
-            "idx": `${i}`,
-            "f": ids1[i],
-            "t": ids2[i]
-          });
-        }
-        try {
-          db.is_foo.save(edge_docs);
-        } catch (ex) {
-          if (ex.errorNum === errors.ERROR_SHUTTING_DOWN.code ||
-              ex.errorNum === errors.ERROR_SIMPLE_CLIENT_COULD_NOT_CONNECT.code) {
-            break;
-          }
-          throw ex;
-        }
-      }
-      return 0;
-    },
+    noiseScript: `
+db._useDatabase('test');
+const errors = require('internal').errors;
+function shuffleArray(array) {
+  for (let i = array.length - 1; i > 0; i--) {
+    const j = Math.floor(Math.random() * (i + 1));
+    [array[i], array[j]] = [array[j], array[i]];
+  }
+}
+let ids1 = [...Array(20).keys()];
+let ids2 = [...Array(20).keys()];
+while(true) {
+  shuffleArray(ids1);
+  shuffleArray(ids2);
+  let edge_docs = [];
+  for (let i = 0; i < 20; i++) {
+    edge_docs.push({
+      "_from": \`foo/\${ids1[i]}:v\${ids1[i]}\`,
+      "_to": \`foo/\${ids2[i]}:v\${ids2[i]}\`,
+      "idx": \`\${i}\`,
+      "f": ids1[i],
+      "t": ids2[i]
+    });
+  }
+  try {
+    db.is_foo.save(edge_docs);
+  } catch (ex) {
+    if (ex.errorNum === errors.ERROR_SHUTTING_DOWN.code ||
+        ex.errorNum === errors.ERROR_SIMPLE_CLIENT_COULD_NOT_CONNECT.code) {
+      break;
+    }
+    throw ex;
+  }
+}
+return 0;
+`,
     noiseVolume: 10,
     noiseDuration: 5,
     preRestoreFn: function() {
