@nxtedition/lib 26.0.28 → 26.0.29

package/app.js

@@ -38,6 +38,8 @@ import makeUnderPressure from './under-pressure.js'
 import undici from '@nxtedition/undici'
 import { isPrimary } from 'node:cluster'
 import { nice } from '@napi-rs/nice'
+import path from 'node:path'
+import { sched_getaffinity, sched_setaffinity } from '@nxtedition/sched'
 
 export function makeApp(appConfig, onTerminate) {
   let ds
@@ -124,13 +126,17 @@ export function makeApp(appConfig, onTerminate) {
   const appDestroyers = []
 
   const serviceName = appConfig.name
-  const serviceModule = appConfig.module ?? 'main'
   const serviceVersion = appConfig.version
+  const serviceModule = appConfig.module ?? 'main'
   const serviceWorkerId = appConfig.workerId ?? threadId
   const serviceInstanceId =
     // process.env.name is the pm2 name of the process
     appConfig.instanceId ?? appConfig.containerId ?? process.env.name ?? os.hostname()
 
+  if (!serviceName) {
+    throw new Error('Service name is required')
+  }
+
   const userAgent = (globalThis.userAgent =
     appConfig.userAgent ??
     (serviceName &&
@@ -310,6 +316,58 @@ export function makeApp(appConfig, onTerminate) {
     }
   }
 
+  let affinity = null
+  if (isMainThread && appConfig.affinity !== false && process.platform === 'linux') {
+    const allNodes = []
+    for (const entry of fs.readdirSync('/sys/devices/system/node')) {
+      if (!entry.startsWith('node')) {
+        continue
+      }
+
+      const cpulist = fs
+        .readFileSync(path.join('/sys/devices/system/node', entry, 'cpulist'), 'utf8')
+        .trim()
+      const cpus = []
+      for (const part of cpulist.split(',')) {
+        if (part.includes('-')) {
+          const [start, end] = part.split('-').map(Number)
+          for (let i = start; i <= end; i++) {
+            cpus.push(i)
+          }
+        } else {
+          cpus.push(Number(part))
+        }
+      }
+      allNodes.push(cpus)
+    }
+
+    if (Number.isInteger(appConfig.affinity) && appConfig.affinity >= 0) {
+      affinity = allNodes[appConfig.affinity % allNodes.length]
+    } else if (appConfig.affinity == null) {
+      affinity = allNodes[hashString(serviceName) % allNodes.length]
+    } else {
+      throw new Error('invalid affinity configuration: ' + appConfig.affinity)
+    }
+
+    affinity = fp.uniq(affinity)
+    affinity = fp.intersection(affinity, sched_getaffinity(0))
+
+    if (
+      !Array.isArray(affinity) ||
+      affinity.length === 0 ||
+      affinity.some((x) => typeof x !== 'number' || x < 0)
+    ) {
+      throw new Error('invalid affinity configuration: ' + appConfig.affinity)
+    }
+
+    try {
+      sched_setaffinity(0, affinity)
+      logger.debug({ data: { value: appConfig.affinity, affinity } }, 'sched_setaffinity succeeded')
+    } catch (err) {
+      logger.error({ err }, 'sched_setaffinity failed')
+    }
+  }
+
   if (appConfig.toobusy) {
     const resolution = appConfig.toobusy.resolution ?? 10
     const interval = appConfig.toobusy.interval ?? 500
@@ -1275,5 +1333,6 @@ export function makeApp(appConfig, onTerminate) {
     serviceInstanceId,
     serviceWorkerId,
     signal: ac.signal,
+    affinity,
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "26.0.28",
+  "version": "26.0.29",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -68,6 +68,7 @@
     "@elastic/transport": "^8.9.3",
     "@napi-rs/nice": "^1.1.1",
     "@nxtedition/nxt-undici": "^6.4.0",
+    "@nxtedition/sched": "^1.0.1",
     "@smithy/node-http-handler": "^4.1.1",
     "acorn": "^8.15.0",
     "astring": "^1.9.0",