fix(vm-threads): don't crash on percentage based memoryLimit (#4802)

inottn · AriPerkkio · web-flow · commit 70e8a3897319 · 2024-01-01T17:21:33.000+02:00
Co-authored-by: Ari Perkkiö &lt;ari.perkkio@gmail.com&gt;
diff --git a/packages/vitest/src/node/pools/vm-threads.ts b/packages/vitest/src/node/pools/vm-threads.ts
@@ -170,9 +170,10 @@ function getMemoryLimit(config: ResolvedConfig) {
     )
   }
 
-  if (limit && limit > 1)
+  // If totalmem is not supported we cannot resolve percentage based values like 0.5, "50%"
+  if ((typeof limit === 'number' && limit > 1) || (typeof limit === 'string' && limit.at(-1) !== '%'))
     return stringToBytes(limit)
 
-  // just ignore "experimentalVmWorkerMemoryLimit" value because we cannot detect memory limit
+  // just ignore "memoryLimit" value because we cannot detect memory limit
   return null
 }
diff --git a/packages/vitest/src/utils/memory-limit.ts b/packages/vitest/src/utils/memory-limit.ts
@@ -23,7 +23,7 @@ export function getWorkerMemoryLimit(config: ResolvedConfig) {
   const memoryLimit = config.poolOptions?.vmThreads?.memoryLimit
 
   if (memoryLimit)
-    return stringToBytes(memoryLimit)
+    return memoryLimit
 
   return 1 / (config.poolOptions?.vmThreads?.maxThreads ?? getDefaultThreadsCount(config))
 }
@@ -94,7 +94,7 @@ export function stringToBytes(
       return Math.floor(input)
     }
     else {
-      throw new Error('Unexpected numerical input for "experimentalVmWorkerMemoryLimit"')
+      throw new Error('Unexpected numerical input for "memoryLimit"')
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -170,9 +170,10 @@ function getMemoryLimit(config: ResolvedConfig) {`
`170`	`170`	`)`
`171`	`171`	`}`
`172`	`172`
`173`		`- if (limit && limit > 1)`
	`173`	`+ // If totalmem is not supported we cannot resolve percentage based values like 0.5, "50%"`
	`174`	`+ if ((typeof limit === 'number' && limit > 1) \|\| (typeof limit === 'string' && limit.at(-1) !== '%'))`
`174`	`175`	`return stringToBytes(limit)`
`175`	`176`
`176`		`- // just ignore "experimentalVmWorkerMemoryLimit" value because we cannot detect memory limit`
	`177`	`+ // just ignore "memoryLimit" value because we cannot detect memory limit`
`177`	`178`	`return null`
`178`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export function getWorkerMemoryLimit(config: ResolvedConfig) {`
`23`	`23`	`const memoryLimit = config.poolOptions?.vmThreads?.memoryLimit`
`24`	`24`
`25`	`25`	`if (memoryLimit)`
`26`		`- return stringToBytes(memoryLimit)`
	`26`	`+ return memoryLimit`
`27`	`27`
`28`	`28`	`return 1 / (config.poolOptions?.vmThreads?.maxThreads ?? getDefaultThreadsCount(config))`
`29`	`29`	`}`
`@@ -94,7 +94,7 @@ export function stringToBytes(`
`94`	`94`	`return Math.floor(input)`
`95`	`95`	`}`
`96`	`96`	`else {`
`97`		`- throw new Error('Unexpected numerical input for "experimentalVmWorkerMemoryLimit"')`
	`97`	`+ throw new Error('Unexpected numerical input for "memoryLimit"')`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`