Merge branch 'release/1.16.1'

Author: maurizi

CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+### Changed
+
+### Fixed
+
+## [1.16.1]
+
+### Fixed
+- Fix routing in worker-pool.ts [#1187](https://github.com/PublicMapping/districtbuilder/pull/1187)
+
+## [1.16.0]
+
 ### Added
 - Add color picker to reference layer flyout [#1150](https://github.com/PublicMapping/districtbuilder/pull/1150)
 - Add district type to project cards on 'My Maps' page [#1162](https://github.com/PublicMapping/districtbuilder/pull/1162)
@@ -467,7 +480,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release.
 
-[unreleased]: https://github.com/publicmapping/districtbuilder/compare/1.15.1...HEAD
+[unreleased]: https://github.com/publicmapping/districtbuilder/compare/1.16.1...HEAD
+[1.16.1]: https://github.com/publicmapping/districtbuilder/compare/1.16.0...1.16.1
+[1.16.0]: https://github.com/publicmapping/districtbuilder/compare/1.15.1...1.16.0
 [1.15.1]: https://github.com/publicmapping/districtbuilder/compare/1.15.0...1.15.1
 [1.15.0]: https://github.com/publicmapping/districtbuilder/compare/1.14.0...1.15.0
 [1.14.0]: https://github.com/publicmapping/districtbuilder/compare/1.13.0...1.14.0

src/server/src/healthcheck/healthcheck.controller.ts

@@ -26,7 +26,7 @@ export class HealthcheckController {
     const timeout = process.env.TYPEORM_HEALTH_CHECK_TIMEOUT
       ? Number(process.env.TYPEORM_HEALTH_CHECK_TIMEOUT)
       : undefined;
-    const maxRss = os.totalmem() * 0.9;
+    const maxRss = os.totalmem() * 0.95;
     return this.health.check([
       () => this.db.pingCheck("database", { timeout }),
       () => this.topoLoaded.isHealthy("topology"),

src/server/src/worker-pool.ts

@@ -13,7 +13,7 @@ import { Functions, MergeArgs, TopologyMetadata } from "./worker";
 // Timeout after which we kill/recreate the worker thread
 const TASK_TIMEOUT_MS = 90_000;
 
-// Reserve 5Gb + 30% of memory for responding to requests and loading topology data from disk
+// Reserve 6Gb + 35% of memory for responding to requests and loading topology data from disk
 // Remaining amount is split amongst each worker for topology data
 // This strategy seems to work for any amount of host memory and targets total memory
 // in use maxing out at around 80%
@@ -22,7 +22,7 @@ const dockerMemLimit = Number(
 );
 const hostmem = os.totalmem();
 const totalmem = Math.min(hostmem, dockerMemLimit);
-const reservedMem = 5 * 1024 * 1024 * 1024 + totalmem * 0.3;
+const reservedMem = 6 * 1024 * 1024 * 1024 + totalmem * 0.35;
 const maxCacheSize = Math.ceil((totalmem - reservedMem) / NUM_WORKERS);
 
 const logger = new Logger("worker-pool");
@@ -83,13 +83,14 @@ async function findQueue(
   const size = regionSizes[regionConfig.id];
 
   // Choose our next index by size
+  const willFit = (worker: number) => workerSizes[worker] + size < maxCacheSize;
   const getBestFit = (workers: number[]): number =>
     (!size
       ? // Use the smallest worker if size is unknown
         _.minBy(workers, idx => workerSizes[idx])
       : // Use the largest worker that will fit if size is known
-      workerSizes.some(workerSize => workerSize + size < maxCacheSize)
-      ? _.minBy(workers, idx => maxCacheSize - (workerSizes[idx] + size))
+      workers.some(willFit)
+      ? _.minBy(workers.filter(willFit), idx => maxCacheSize - (workerSizes[idx] + size))
       : // If no workers will fit, we use the least recently used worker
         // eslint-disable-next-line functional/immutable-data
         workersByRecency.pop()) || workers[0];