Skip to content

Commit

Permalink
feat: add proving retries (AztecProtocol#6145)
Browse files Browse the repository at this point in the history
This PR adds retries to proving requests. This is especially needed when
building real proofs as those touch the filesystem (to generate keys,
move bytecode, write public inputs etc.) and that could fail for various
reasons.
  • Loading branch information
alexghr authored May 3, 2024
1 parent fdb93e1 commit 39ab99c
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 6 deletions.
2 changes: 1 addition & 1 deletion yarn-project/prover-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"formatting": "run -T prettier --check ./src && run -T eslint ./src",
"formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
"bb": "node --no-warnings ./dest/bb/index.js",
"test": "LOG_LEVEL=${LOG_LEVEL:-silent} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=600000 --forceExit"
"test": "LOG_LEVEL=${LOG_LEVEL:-silent} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=750000 --forceExit"
},
"jest": {
"moduleNameMapper": {
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/prover-client/package.local.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"scripts": {
"test": "LOG_LEVEL=${LOG_LEVEL:-silent} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=600000 --forceExit"
"test": "LOG_LEVEL=${LOG_LEVEL:-silent} DEBUG_COLORS=1 NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=750000 --forceExit"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,27 @@ describe('MemoryProvingQueue', () => {
await expect(promise).resolves.toEqual(new RootParityInput(proof, vk, publicInputs));
});

it('notifies of errors', async () => {
it('retries failed jobs', async () => {
const inputs = makeBaseParityInputs();
const promise = queue.getBaseParityProof(inputs);
void queue.getBaseParityProof(inputs);

const job = await queue.getProvingJob();
expect(job?.request.inputs).toEqual(inputs);

const error = new Error('test error');

await queue.rejectProvingJob(job!.id, error);
await expect(queue.getProvingJob()).resolves.toEqual(job);
});

it('notifies errors', async () => {
const promise = queue.getBaseParityProof(makeBaseParityInputs());

const error = new Error('test error');
await queue.rejectProvingJob((await queue.getProvingJob())!.id, error);
await queue.rejectProvingJob((await queue.getProvingJob())!.id, error);
await queue.rejectProvingJob((await queue.getProvingJob())!.id, error);

await expect(promise).rejects.toEqual(error);
});
});
21 changes: 19 additions & 2 deletions yarn-project/prover-client/src/prover-pool/memory-proving-queue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ type ProvingJobWithResolvers<T extends ProvingRequest = ProvingRequest> = {
id: string;
request: T;
signal?: AbortSignal;
attempts: number;
} & PromiseWithResolvers<ProvingRequestResult<T['type']>>;

const MAX_RETRIES = 3;

export class MemoryProvingQueue implements CircuitProver, ProvingJobSource {
private jobId = 0;
private log = createDebugLogger('aztec:prover-client:prover-pool:queue');
Expand Down Expand Up @@ -95,7 +98,18 @@ export class MemoryProvingQueue implements CircuitProver, ProvingJobSource {
return Promise.resolve();
}

job.reject(err);
if (job.attempts < MAX_RETRIES) {
job.attempts++;
this.log.warn(
`Job id=${job.id} type=${ProvingRequestType[job.request.type]} failed with error: ${err}. Retry ${
job.attempts
}/${MAX_RETRIES}`,
);
this.queue.put(job);
} else {
this.log.error(`Job id=${job.id} type=${ProvingRequestType[job.request.type]} failed with error: ${err}`);
job.reject(err);
}
return Promise.resolve();
}

Expand All @@ -111,13 +125,16 @@ export class MemoryProvingQueue implements CircuitProver, ProvingJobSource {
promise,
resolve,
reject,
attempts: 1,
};

if (signal) {
signal.addEventListener('abort', () => reject(new AbortedError('Operation has been aborted')));
}

this.log.info(`Adding ${ProvingRequestType[request.type]} proving job to queue`);
this.log.info(
`Adding id=${item.id} type=${ProvingRequestType[request.type]} proving job to queue depth=${this.queue.length()}`,
);
// TODO (alexg) remove the `any`
if (!this.queue.put(item as any)) {
throw new Error();
Expand Down

0 comments on commit 39ab99c

Please sign in to comment.