Skip to content

fix: adjust decryption worker pool size based on keystore count #5608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wemeetagain merged 1 commit into from
Jun 5, 2023
Merged

fix: adjust decryption worker pool size based on keystore count #5608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/cli/src/cmds/validator/keymanager/decryptKeystoreDefinitions/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import bls from "@chainsafe/bls";
import {LocalKeystoreDefinition} from "../interface.js";
import {clearKeystoreCache, loadKeystoreCache, writeKeystoreCache} from "../keystoreCache.js";
import {lockFilepath, unlockFilepath} from "../../../../util/lockfile.js";
import {defaultPoolSize} from "./poolSize.js";
import {maxPoolSize} from "./poolSize.js";
import {DecryptKeystoreWorkerAPI, KeystoreDecryptOptions} from "./types.js";

/**
Expand Down Expand Up @@ -35,8 +35,9 @@ export async function decryptKeystoreDefinitions(
}
}

const signers = new Array(keystoreDefinitions.length) as SignerLocal[];
const passwords = new Array(keystoreDefinitions.length) as string[];
const keystoreCount = keystoreDefinitions.length;
const signers = new Array<SignerLocal>(keystoreCount);
const passwords = new Array<string>(keystoreCount);
const tasks: QueuedTask<ModuleThread<DecryptKeystoreWorkerAPI>, Uint8Array>[] = [];
const errors: Error[] = [];
const pool = Pool(
Expand All @@ -45,7 +46,7 @@ export async function decryptKeystoreDefinitions(
// The number below is big enough to almost disable the timeout which helps during tests run on unpredictablely slow hosts
timeout: 5 * 60 * 1000,
}),
defaultPoolSize
Math.min(keystoreCount, maxPoolSize)
);
for (const [index, definition] of keystoreDefinitions.entries()) {
lockKeystore(definition.keystorePath, opts);
Expand Down
12 changes: 6 additions & 6 deletions packages/cli/src/cmds/validator/keymanager/decryptKeystoreDefinitions/poolSize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
let defaultPoolSize: number;
let maxPoolSize: number;

try {
if (typeof navigator !== "undefined") {
defaultPoolSize = navigator.hardwareConcurrency ?? 4;
maxPoolSize = navigator.hardwareConcurrency ?? 4;
} else {
// TODO change this line to use os.availableParallelism() once we upgrade to node v20
defaultPoolSize = (await import("node:os")).cpus().length;
maxPoolSize = (await import("node:os")).cpus().length;
}
} catch (e) {
defaultPoolSize = 8;
maxPoolSize = 8;
}

/**
* Cross-platform aprox number of logical cores
* Cross-platform approx number of logical cores
*/
export {defaultPoolSize};
export {maxPoolSize};