@nxtedition/lib 26.0.36 → 26.0.37

package/app.js

@@ -38,7 +38,7 @@ import makeUnderPressure from './under-pressure.js'
 import undici from '@nxtedition/undici'
 import { isPrimary } from 'node:cluster'
 import path from 'node:path'
-import { nice, sched_getaffinity, sched_setaffinity } from '@nxtedition/sched'
+import { nice, sched_setaffinity } from '@nxtedition/sched'
 
 export function makeApp(appConfig, onTerminate) {
   let ds
@@ -353,33 +353,25 @@ export function makeApp(appConfig, onTerminate) {
       numa === 'default'
     ) {
       indices = [hashString(JSON.stringify({ serviceName, serviceModule })) % allNodes.length]
-    } else {
-      throw Object.assign(new Error('invalid numa configuration: ' + numa), {
-        data: { numa, allNodes },
-      })
     }
 
-    const prev = sched_getaffinity(0)
-
     affinity = indices.flatMap((i) => allNodes[i] ?? [])
-    affinity = fp.uniq(affinity)
-    affinity = fp.intersection(affinity, prev)
-
     if (
-      !Array.isArray(affinity) ||
-      affinity.length === 0 ||
-      affinity.some((x) => !Number.isInteger(x) || x < 0)
+      Array.isArray(affinity) &&
+      affinity.length > 0 &&
+      affinity.every((x) => Number.isInteger(x) && x >= 0)
     ) {
-      throw Object.assign(new Error('invalid numa configuration:' + numa), {
-        data: { numa, allNodes, indices, next: affinity, prev },
-      })
-    }
-
-    try {
-      sched_setaffinity(0, affinity)
-      logger.debug({ data: { numa, affinity, indices } }, 'sched_setaffinity succeeded')
-    } catch (err) {
-      logger.error({ err }, 'sched_setaffinity failed')
+      try {
+        sched_setaffinity(0, affinity)
+        logger.debug({ data: { numa, affinity, indices } }, 'sched_setaffinity succeeded')
+      } catch (err) {
+        logger.error(
+          { err, data: { numa, allNodes, indices, affinity } },
+          'sched_setaffinity failed',
+        )
+      }
+    } else {
+      logger.warn({ data: { numa, allNodes, indices, affinity } }, 'sched_setaffinity failed')
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "26.0.36",
+  "version": "26.0.37",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",