pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-04-07 14:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

[feature] Use availableParallelism instead of cpus().length

Browse Source
This commit is contained in:
Sergey Konovalov
2023-07-05 19:39:23 +03:00
parent 3392eef3e8
commit 037e812836
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
FileConverter/sources/convertermaster.js
View File

@ -39,7 +39,7 @@ const operationContext = require('./../../Common/sources/operationContext');
if (cluster.isMaster) {
const fs = require('fs');
const co = require('co');
const numCPUs = require('os').cpus().length;
const os = require('os');
const configCommon = require('config');
const config = configCommon.get('FileConverter.converter');
const license = require('./../../Common/sources/license');
@ -49,7 +49,10 @@ if (cluster.isMaster) {
const cfgMaxProcessCount = config.get('maxprocesscount');
var workersCount = 0;
const readLicense = function* () {
workersCount = Math.ceil(numCPUs * cfgMaxProcessCount);
const numCPUs = os.cpus().length;
const availableParallelism = os.availableParallelism?.();
operationContext.global.logger.warn('num of CPUs: %d; availableParallelism: %s', numCPUs, availableParallelism);
workersCount = Math.ceil((availableParallelism || numCPUs) * cfgMaxProcessCount);
let [licenseInfo] = yield* license.readLicense(cfgLicenseFile);
workersCount = Math.min(licenseInfo.count, workersCount);
//todo send license to workers for multi-tenancy