From 347da4e6bb70ffe9348629df6133da874d6d58ba Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Tue, 24 Oct 2023 12:44:11 +0200
Subject: [PATCH] Merge pull request #15247 from
 overleaf/jpa-submission-backend-class

[web] use n2d instances for compiling submissions

GitOrigin-RevId: 57eb27af230b994c3816c0476673ea558226ac1e
---
 .../web/app/src/Features/Compile/CompileController.js    | 4 ++--
 services/web/config/settings.defaults.js                 | 2 ++
 services/web/test/unit/src/Compile/ClsiManagerTests.js   | 1 +
 .../web/test/unit/src/Compile/CompileControllerTests.js  | 9 +++++----
 .../web/test/unit/src/Compile/CompileManagerTests.js     | 4 +++-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/services/web/app/src/Features/Compile/CompileController.js b/services/web/app/src/Features/Compile/CompileController.js
index 4f1f59d163..f15007b960 100644
--- a/services/web/app/src/Features/Compile/CompileController.js
+++ b/services/web/app/src/Features/Compile/CompileController.js
@@ -244,7 +244,7 @@ module.exports = CompileController = {
     }
     options.compileGroup =
       req.body?.compileGroup || Settings.defaultFeatures.compileGroup
-    options.compileBackendClass = Settings.apis.clsi.defaultBackendClass
+    options.compileBackendClass = Settings.apis.clsi.submissionBackendClass
     options.timeout =
       req.body?.timeout || Settings.defaultFeatures.compileTimeout
     ClsiManager.sendExternalRequest(
@@ -440,7 +440,7 @@ module.exports = CompileController = {
         req.body?.compileGroup ||
         req.query?.compileGroup ||
         Settings.defaultFeatures.compileGroup,
-      compileBackendClass: Settings.apis.clsi.defaultBackendClass,
+      compileBackendClass: Settings.apis.clsi.submissionBackendClass,
     }
     CompileController.proxyToClsiWithLimits(
       submissionId,
diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js
index 5ee72d0f47..e27b029895 100644
--- a/services/web/config/settings.defaults.js
+++ b/services/web/config/settings.defaults.js
@@ -226,6 +226,8 @@ module.exports = {
       // url: "http://#{process.env['CLSI_LB_HOST']}:3014"
       backendGroupName: undefined,
       defaultBackendClass: process.env.CLSI_DEFAULT_BACKEND_CLASS || 'e2',
+      submissionBackendClass:
+        process.env.CLSI_SUBMISSION_BACKEND_CLASS || 'n2d',
     },
     project_history: {
       sendProjectStructureOps: true,
diff --git a/services/web/test/unit/src/Compile/ClsiManagerTests.js b/services/web/test/unit/src/Compile/ClsiManagerTests.js
index f7c38c8c52..a0f58897d5 100644
--- a/services/web/test/unit/src/Compile/ClsiManagerTests.js
+++ b/services/web/test/unit/src/Compile/ClsiManagerTests.js
@@ -121,6 +121,7 @@ describe('ClsiManager', function () {
         clsi: {
           url: `http://${CLSI_HOST}`,
           defaultBackendClass: 'e2',
+          submissionBackendClass: 'n2d',
         },
         clsi_priority: {
           url: 'https://clsipremium.example.com',
diff --git a/services/web/test/unit/src/Compile/CompileControllerTests.js b/services/web/test/unit/src/Compile/CompileControllerTests.js
index 546ca3e850..03de9fb465 100644
--- a/services/web/test/unit/src/Compile/CompileControllerTests.js
+++ b/services/web/test/unit/src/Compile/CompileControllerTests.js
@@ -33,6 +33,7 @@ describe('CompileController', function () {
         clsi: {
           url: 'http://clsi.example.com',
           defaultBackendClass: 'e2',
+          submissionBackendClass: 'n2d',
         },
         clsi_priority: {
           url: 'http://clsi-priority.example.com',
@@ -337,7 +338,7 @@ describe('CompileController', function () {
         this.ClsiManager.sendExternalRequest.should.have.been.calledWith(
           this.submission_id,
           { compileGroup: 'special', timeout: 600 },
-          { compileGroup: 'special', compileBackendClass: 'e2', timeout: 600 }
+          { compileGroup: 'special', compileBackendClass: 'n2d', timeout: 600 }
         )
       })
     })
@@ -368,7 +369,7 @@ describe('CompileController', function () {
             draft: true,
             check: 'validate',
             compileGroup: 'standard',
-            compileBackendClass: 'e2',
+            compileBackendClass: 'n2d',
             timeout: 60,
           }
         )
@@ -486,7 +487,7 @@ describe('CompileController', function () {
           {},
           {
             compileGroup: 'standard',
-            compileBackendClass: 'e2',
+            compileBackendClass: 'n2d',
           }
         )
       })
@@ -510,7 +511,7 @@ describe('CompileController', function () {
           {},
           {
             compileGroup: 'special',
-            compileBackendClass: 'e2',
+            compileBackendClass: 'n2d',
           }
         )
       })
diff --git a/services/web/test/unit/src/Compile/CompileManagerTests.js b/services/web/test/unit/src/Compile/CompileManagerTests.js
index 892dc871bc..47572c9a4a 100644
--- a/services/web/test/unit/src/Compile/CompileManagerTests.js
+++ b/services/web/test/unit/src/Compile/CompileManagerTests.js
@@ -22,7 +22,9 @@ describe('CompileManager', function () {
     this.CompileManager = SandboxedModule.require(MODULE_PATH, {
       requires: {
         '@overleaf/settings': (this.settings = {
-          apis: { clsi: { defaultBackendClass: 'e2' } },
+          apis: {
+            clsi: { defaultBackendClass: 'e2', submissionBackendClass: 'n2d' },
+          },
           redis: { web: { host: 'localhost', port: 42 } },
           rateLimit: { autoCompile: {} },
         }),