Răsfoiți Sursa

[clsi-cache] remove non sharded instances (#25645)

* Revert "[clsi-cache] only use sharding from updated project editor tabs (#25326)"

This reverts commit 1754276bed3186c0536055c983e32476cc90d416.

* [clsi-cache] remove non sharded instances

GitOrigin-RevId: aa3ac46140dfc1722a3350cf7071e5b11af61199
Jakob Ackermann 1 an în urmă
părinte
comite
ec1bd69605

+ 1 - 8
services/clsi/app/js/CLSICacheHandler.js

@@ -41,7 +41,6 @@ function getShard(projectId) {
  * @param {string} editorId
  * @param {[{path: string}]} outputFiles
  * @param {string} compileGroup
- * @param {boolean} clsiCacheSharded
  * @param {Record<string, any>} options
  * @return {string | undefined}
  */
@@ -52,17 +51,11 @@ function notifyCLSICacheAboutBuild({
   editorId,
   outputFiles,
   compileGroup,
-  clsiCacheSharded,
   options,
 }) {
   if (!Settings.apis.clsiCache.enabled) return undefined
   if (!OBJECT_ID_REGEX.test(projectId)) return undefined
-  let { url, shard } = getShard(projectId)
-  if (!clsiCacheSharded) {
-    // Client is not aware of sharding yet.
-    url = Settings.apis.clsiCache.url
-    shard = 'cache'
-  }
+  const { url, shard } = getShard(projectId)
 
   /**
    * @param {[{path: string}]} files

+ 0 - 1
services/clsi/app/js/CompileController.js

@@ -125,7 +125,6 @@ function compile(req, res, next) {
                 editorId: request.editorId,
                 outputFiles,
                 compileGroup: request.compileGroup,
-                clsiCacheSharded: request.clsiCacheSharded,
                 options: {
                   compiler: request.compiler,
                   draft: request.draft,

+ 0 - 8
services/clsi/app/js/RequestParser.js

@@ -90,14 +90,6 @@ function parse(body, callback) {
         type: 'boolean',
       }
     )
-    response.clsiCacheSharded = _parseAttribute(
-      'clsiCacheSharded',
-      compile.options.clsiCacheSharded,
-      {
-        default: false,
-        type: 'boolean',
-      }
-    )
     response.check = _parseAttribute('check', compile.options.check, {
       type: 'string',
     })

+ 2 - 10
services/clsi/config/settings.defaults.js

@@ -60,16 +60,8 @@ module.exports = {
       }`,
     },
     clsiCache: {
-      enabled: !!(process.env.CLSI_CACHE_SHARDS || process.env.CLSI_CACHE_HOST),
-      url: `http://${process.env.CLSI_CACHE_HOST}:3044`,
-      shards: process.env.CLSI_CACHE_SHARDS
-        ? JSON.parse(process.env.CLSI_CACHE_SHARDS)
-        : [
-            {
-              url: `http://${process.env.CLSI_CACHE_HOST}:3044`,
-              shard: 'cache',
-            },
-          ],
+      enabled: !!process.env.CLSI_CACHE_SHARDS,
+      shards: JSON.parse(process.env.CLSI_CACHE_SHARDS || '[]'),
     },
   },
 

+ 0 - 1
services/web/app/src/Features/Compile/ClsiManager.js

@@ -781,7 +781,6 @@ function _finaliseRequest(projectId, options, project, docs, files) {
         imageName: project.imageName,
         draft: Boolean(options.draft),
         stopOnFirstError: Boolean(options.stopOnFirstError),
-        clsiCacheSharded: Boolean(options.clsiCacheSharded),
         check: options.check,
         syncType: options.syncType,
         syncState: options.syncState,

+ 0 - 2
services/web/app/src/Features/Compile/CompileController.js

@@ -128,14 +128,12 @@ const _CompileController = {
     const isAutoCompile = !!req.query.auto_compile
     const fileLineErrors = !!req.query.file_line_errors
     const stopOnFirstError = !!req.body.stopOnFirstError
-    const clsiCacheSharded = !!req.body.clsiCacheSharded
     const userId = SessionManager.getLoggedInUserId(req.session)
     const options = {
       isAutoCompile,
       fileLineErrors,
       stopOnFirstError,
       editorId: req.body.editorId,
-      clsiCacheSharded,
     }
 
     if (req.body.rootDoc_id) {

+ 0 - 1
services/web/frontend/js/features/pdf-preview/util/compiler.js

@@ -110,7 +110,6 @@ export default class DocumentCompiler {
         incrementalCompilesEnabled: !this.error,
         stopOnFirstError: options.stopOnFirstError,
         editorId: EDITOR_SESSION_ID,
-        clsiCacheSharded: true,
       }
 
       const data = await postJSON(

+ 0 - 4
services/web/test/unit/src/Compile/CompileControllerTests.js

@@ -251,7 +251,6 @@ describe('CompileController', function () {
             fileLineErrors: false,
             stopOnFirstError: false,
             editorId: undefined,
-            clsiCacheSharded: false,
           }
         )
       })
@@ -294,7 +293,6 @@ describe('CompileController', function () {
             fileLineErrors: false,
             stopOnFirstError: false,
             editorId: undefined,
-            clsiCacheSharded: false,
           }
         )
       })
@@ -319,7 +317,6 @@ describe('CompileController', function () {
             fileLineErrors: false,
             stopOnFirstError: false,
             editorId: undefined,
-            clsiCacheSharded: false,
           }
         )
       })
@@ -343,7 +340,6 @@ describe('CompileController', function () {
             fileLineErrors: false,
             stopOnFirstError: false,
             editorId: 'the-editor-id',
-            clsiCacheSharded: false,
           }
         )
       })