@aztec/prover-client 0.73.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/bin/get-proof-inputs.js +18 -16
- package/dest/block_builder/index.js +0 -1
- package/dest/block_builder/light.js +23 -13
- package/dest/config.js +9 -11
- package/dest/index.js +0 -1
- package/dest/mocks/fixtures.js +28 -26
- package/dest/mocks/test_context.js +55 -31
- package/dest/orchestrator/block-building-helpers.js +90 -90
- package/dest/orchestrator/block-proving-state.js +95 -70
- package/dest/orchestrator/epoch-proving-state.js +53 -40
- package/dest/orchestrator/index.js +0 -1
- package/dest/orchestrator/orchestrator.js +649 -653
- package/dest/orchestrator/orchestrator_metrics.js +4 -3
- package/dest/orchestrator/tx-proving-state.js +52 -51
- package/dest/prover-agent/index.js +0 -1
- package/dest/prover-agent/memory-proving-queue.js +237 -248
- package/dest/prover-agent/prover-agent.js +184 -187
- package/dest/prover-agent/proving-error.js +0 -1
- package/dest/prover-agent/queue_metrics.js +6 -5
- package/dest/prover-agent/rpc.js +6 -4
- package/dest/prover-client/factory.js +0 -1
- package/dest/prover-client/index.js +0 -1
- package/dest/prover-client/prover-client.js +30 -25
- package/dest/prover-client/server-epoch-prover.js +4 -4
- package/dest/proving_broker/broker_prover_facade.js +70 -59
- package/dest/proving_broker/config.js +22 -37
- package/dest/proving_broker/factory.js +1 -2
- package/dest/proving_broker/fixtures.js +0 -1
- package/dest/proving_broker/index.js +0 -1
- package/dest/proving_broker/proof_store/factory.js +9 -12
- package/dest/proving_broker/proof_store/gcs_proof_store.js +11 -7
- package/dest/proving_broker/proof_store/index.js +0 -1
- package/dest/proving_broker/proof_store/inline_proof_store.js +11 -7
- package/dest/proving_broker/proof_store/proof_store.js +3 -2
- package/dest/proving_broker/proving_agent.js +121 -110
- package/dest/proving_broker/proving_agent_instrumentation.js +3 -3
- package/dest/proving_broker/proving_broker.js +491 -451
- package/dest/proving_broker/proving_broker_database/memory.js +19 -13
- package/dest/proving_broker/proving_broker_database/persisted.js +41 -21
- package/dest/proving_broker/proving_broker_database.js +3 -2
- package/dest/proving_broker/proving_broker_instrumentation.js +28 -21
- package/dest/proving_broker/proving_job_controller.js +81 -62
- package/dest/proving_broker/rpc.js +23 -15
- package/dest/test/mock_prover.js +11 -9
- package/package.json +13 -11
- package/src/index.ts +1 -1
- package/src/orchestrator/block-building-helpers.ts +1 -1
- package/src/proving_broker/proving_agent.ts +30 -11
- package/src/proving_broker/proving_broker.ts +53 -27
- package/src/proving_broker/rpc.ts +8 -2
- package/dest/bin/get-proof-inputs.d.ts +0 -2
- package/dest/bin/get-proof-inputs.d.ts.map +0 -1
- package/dest/block_builder/index.d.ts +0 -6
- package/dest/block_builder/index.d.ts.map +0 -1
- package/dest/block_builder/light.d.ts +0 -31
- package/dest/block_builder/light.d.ts.map +0 -1
- package/dest/config.d.ts +0 -17
- package/dest/config.d.ts.map +0 -1
- package/dest/index.d.ts +0 -4
- package/dest/index.d.ts.map +0 -1
- package/dest/mocks/fixtures.d.ts +0 -19
- package/dest/mocks/fixtures.d.ts.map +0 -1
- package/dest/mocks/test_context.d.ts +0 -49
- package/dest/mocks/test_context.d.ts.map +0 -1
- package/dest/orchestrator/block-building-helpers.d.ts +0 -50
- package/dest/orchestrator/block-building-helpers.d.ts.map +0 -1
- package/dest/orchestrator/block-proving-state.d.ts +0 -71
- package/dest/orchestrator/block-proving-state.d.ts.map +0 -1
- package/dest/orchestrator/epoch-proving-state.d.ts +0 -56
- package/dest/orchestrator/epoch-proving-state.d.ts.map +0 -1
- package/dest/orchestrator/index.d.ts +0 -2
- package/dest/orchestrator/index.d.ts.map +0 -1
- package/dest/orchestrator/orchestrator.d.ts +0 -108
- package/dest/orchestrator/orchestrator.d.ts.map +0 -1
- package/dest/orchestrator/orchestrator_metrics.d.ts +0 -8
- package/dest/orchestrator/orchestrator_metrics.d.ts.map +0 -1
- package/dest/orchestrator/tx-proving-state.d.ts +0 -31
- package/dest/orchestrator/tx-proving-state.d.ts.map +0 -1
- package/dest/prover-agent/index.d.ts +0 -4
- package/dest/prover-agent/index.d.ts.map +0 -1
- package/dest/prover-agent/memory-proving-queue.d.ts +0 -82
- package/dest/prover-agent/memory-proving-queue.d.ts.map +0 -1
- package/dest/prover-agent/prover-agent.d.ts +0 -43
- package/dest/prover-agent/prover-agent.d.ts.map +0 -1
- package/dest/prover-agent/proving-error.d.ts +0 -5
- package/dest/prover-agent/proving-error.d.ts.map +0 -1
- package/dest/prover-agent/queue_metrics.d.ts +0 -10
- package/dest/prover-agent/queue_metrics.d.ts.map +0 -1
- package/dest/prover-agent/rpc.d.ts +0 -11
- package/dest/prover-agent/rpc.d.ts.map +0 -1
- package/dest/prover-client/factory.d.ts +0 -6
- package/dest/prover-client/factory.d.ts.map +0 -1
- package/dest/prover-client/index.d.ts +0 -3
- package/dest/prover-client/index.d.ts.map +0 -1
- package/dest/prover-client/prover-client.d.ts +0 -42
- package/dest/prover-client/prover-client.d.ts.map +0 -1
- package/dest/prover-client/server-epoch-prover.d.ts +0 -25
- package/dest/prover-client/server-epoch-prover.d.ts.map +0 -1
- package/dest/proving_broker/broker_prover_facade.d.ts +0 -39
- package/dest/proving_broker/broker_prover_facade.d.ts.map +0 -1
- package/dest/proving_broker/config.d.ts +0 -61
- package/dest/proving_broker/config.d.ts.map +0 -1
- package/dest/proving_broker/factory.d.ts +0 -5
- package/dest/proving_broker/factory.d.ts.map +0 -1
- package/dest/proving_broker/fixtures.d.ts +0 -5
- package/dest/proving_broker/fixtures.d.ts.map +0 -1
- package/dest/proving_broker/index.d.ts +0 -10
- package/dest/proving_broker/index.d.ts.map +0 -1
- package/dest/proving_broker/proof_store/factory.d.ts +0 -6
- package/dest/proving_broker/proof_store/factory.d.ts.map +0 -1
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts +0 -13
- package/dest/proving_broker/proof_store/gcs_proof_store.d.ts.map +0 -1
- package/dest/proving_broker/proof_store/index.d.ts +0 -4
- package/dest/proving_broker/proof_store/index.d.ts.map +0 -1
- package/dest/proving_broker/proof_store/inline_proof_store.d.ts +0 -14
- package/dest/proving_broker/proof_store/inline_proof_store.d.ts.map +0 -1
- package/dest/proving_broker/proof_store/proof_store.d.ts +0 -35
- package/dest/proving_broker/proof_store/proof_store.d.ts.map +0 -1
- package/dest/proving_broker/proving_agent.d.ts +0 -44
- package/dest/proving_broker/proving_agent.d.ts.map +0 -1
- package/dest/proving_broker/proving_agent_instrumentation.d.ts +0 -8
- package/dest/proving_broker/proving_agent_instrumentation.d.ts.map +0 -1
- package/dest/proving_broker/proving_broker.d.ts +0 -75
- package/dest/proving_broker/proving_broker.d.ts.map +0 -1
- package/dest/proving_broker/proving_broker_database/memory.d.ts +0 -16
- package/dest/proving_broker/proving_broker_database/memory.d.ts.map +0 -1
- package/dest/proving_broker/proving_broker_database/persisted.d.ts +0 -21
- package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +0 -1
- package/dest/proving_broker/proving_broker_database.d.ts +0 -39
- package/dest/proving_broker/proving_broker_database.d.ts.map +0 -1
- package/dest/proving_broker/proving_broker_instrumentation.d.ts +0 -25
- package/dest/proving_broker/proving_broker_instrumentation.d.ts.map +0 -1
- package/dest/proving_broker/proving_job_controller.d.ts +0 -31
- package/dest/proving_broker/proving_job_controller.d.ts.map +0 -1
- package/dest/proving_broker/rpc.d.ts +0 -11
- package/dest/proving_broker/rpc.d.ts.map +0 -1
- package/dest/test/mock_prover.d.ts +0 -33
- package/dest/test/mock_prover.d.ts.map +0 -1
|
@@ -1,479 +1,526 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
}
|
|
7
|
+
import { ProvingRequestType } from '@aztec/circuit-types';
|
|
3
8
|
import { createLogger } from '@aztec/foundation/log';
|
|
4
9
|
import { RunningPromise, promiseWithResolvers } from '@aztec/foundation/promise';
|
|
5
10
|
import { PriorityMemoryQueue, SerialQueue } from '@aztec/foundation/queue';
|
|
6
11
|
import { Timer } from '@aztec/foundation/timer';
|
|
7
|
-
import { getTelemetryClient, trackSpan
|
|
12
|
+
import { getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
|
|
8
13
|
import assert from 'assert';
|
|
9
14
|
import { ProvingBrokerInstrumentation } from './proving_broker_instrumentation.js';
|
|
10
15
|
/**
|
|
11
16
|
* A broker that manages proof requests and distributes them to workers based on their priority.
|
|
12
17
|
* It takes a backend that is responsible for storing and retrieving proof requests and results.
|
|
13
|
-
*/
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
this.logger.info('Proving Broker already started');
|
|
92
|
-
return Promise.resolve();
|
|
93
|
-
}
|
|
94
|
-
this.logger.info('Proving Broker started');
|
|
95
|
-
for await (const [item, result] of this.database.allProvingJobs()) {
|
|
96
|
-
this.logger.info(`Restoring proving job id=${item.id} settled=${!!result}`, {
|
|
97
|
-
provingJobId: item.id,
|
|
98
|
-
status: result ? result.status : 'pending',
|
|
99
|
-
});
|
|
100
|
-
this.jobsCache.set(item.id, item);
|
|
101
|
-
this.promises.set(item.id, promiseWithResolvers());
|
|
102
|
-
if (result) {
|
|
103
|
-
this.promises.get(item.id).resolve(result);
|
|
104
|
-
this.resultsCache.set(item.id, result);
|
|
105
|
-
}
|
|
106
|
-
else {
|
|
107
|
-
this.enqueueJobInternal(item);
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
this.cleanupPromise.start();
|
|
111
|
-
this.requestQueue.start();
|
|
112
|
-
this.instrumentation.monitorQueueDepth(this.measureQueueDepth);
|
|
113
|
-
this.instrumentation.monitorActiveJobs(this.countActiveJobs);
|
|
114
|
-
this.started = true;
|
|
115
|
-
}
|
|
116
|
-
async stop() {
|
|
117
|
-
if (!this.started) {
|
|
118
|
-
this.logger.warn('ProvingBroker not started');
|
|
119
|
-
return Promise.resolve();
|
|
120
|
-
}
|
|
121
|
-
await this.requestQueue.cancel();
|
|
122
|
-
await this.cleanupPromise.stop();
|
|
123
|
-
}
|
|
124
|
-
enqueueProvingJob(job) {
|
|
125
|
-
return this.requestQueue.put(() => __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_enqueueProvingJob).call(this, job));
|
|
126
|
-
}
|
|
127
|
-
cancelProvingJob(id) {
|
|
128
|
-
return this.requestQueue.put(() => __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_cancelProvingJob).call(this, id));
|
|
129
|
-
}
|
|
130
|
-
getProvingJobStatus(id) {
|
|
131
|
-
return this.requestQueue.put(() => __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_getProvingJobStatus).call(this, id));
|
|
132
|
-
}
|
|
133
|
-
getCompletedJobs(ids) {
|
|
134
|
-
return this.requestQueue.put(() => __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_getCompletedJobs).call(this, ids));
|
|
135
|
-
}
|
|
136
|
-
getProvingJob(filter) {
|
|
137
|
-
return this.requestQueue.put(() => __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_getProvingJob).call(this, filter));
|
|
138
|
-
}
|
|
139
|
-
reportProvingJobSuccess(id, value) {
|
|
140
|
-
return this.requestQueue.put(() => __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_reportProvingJobSuccess).call(this, id, value));
|
|
141
|
-
}
|
|
142
|
-
reportProvingJobError(id, err, retry = false) {
|
|
143
|
-
return this.requestQueue.put(() => __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_reportProvingJobError).call(this, id, err, retry));
|
|
144
|
-
}
|
|
145
|
-
reportProvingJobProgress(id, startedAt, filter) {
|
|
146
|
-
return this.requestQueue.put(() => __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_reportProvingJobProgress).call(this, id, startedAt, filter));
|
|
147
|
-
}
|
|
148
|
-
cleanUpProvingJobState(ids) {
|
|
149
|
-
for (const id of ids) {
|
|
150
|
-
this.jobsCache.delete(id);
|
|
151
|
-
this.promises.delete(id);
|
|
152
|
-
this.resultsCache.delete(id);
|
|
153
|
-
this.inProgress.delete(id);
|
|
154
|
-
this.retries.delete(id);
|
|
18
|
+
*/ export class ProvingBroker {
|
|
19
|
+
database;
|
|
20
|
+
logger;
|
|
21
|
+
queues;
|
|
22
|
+
// holds a copy of the database in memory in order to quickly fulfill requests
|
|
23
|
+
// this is fine because this broker is the only one that can modify the database
|
|
24
|
+
jobsCache;
|
|
25
|
+
// as above, but for results
|
|
26
|
+
resultsCache;
|
|
27
|
+
// tracks when each job was enqueued
|
|
28
|
+
enqueuedAt;
|
|
29
|
+
// keeps track of which jobs are currently being processed
|
|
30
|
+
// in the event of a crash this information is lost, but that's ok
|
|
31
|
+
// the next time the broker starts it will recreate jobsCache and still
|
|
32
|
+
// accept results from the workers
|
|
33
|
+
inProgress;
|
|
34
|
+
// keep track of which proving job has been retried
|
|
35
|
+
retries;
|
|
36
|
+
// a map of promises that will be resolved when a job is settled
|
|
37
|
+
promises;
|
|
38
|
+
cleanupPromise;
|
|
39
|
+
msTimeSource;
|
|
40
|
+
jobTimeoutMs;
|
|
41
|
+
maxRetries;
|
|
42
|
+
instrumentation;
|
|
43
|
+
tracer;
|
|
44
|
+
completedJobNotifications;
|
|
45
|
+
/**
|
|
46
|
+
* The broker keeps track of the highest epoch its seen.
|
|
47
|
+
* This information is used for garbage collection: once it reaches the next epoch, it can start pruning the database of old state.
|
|
48
|
+
* It is important that this value is initialised to zero. This ensures that we don't delete any old jobs until the current
|
|
49
|
+
* process instance receives a job request informing it of the actual current highest epoch
|
|
50
|
+
* Example:
|
|
51
|
+
* proving epoch 11 - the broker will wipe all jobs for epochs 9 and lower
|
|
52
|
+
* finished proving epoch 11 and got first job for epoch 12 -> the broker will wipe all settled jobs for epochs 10 and lower
|
|
53
|
+
* reorged back to end of epoch 10 -> epoch 11 is skipped and epoch 12 starts -> the broker will wipe all settled jobs for epochs 10 and lower
|
|
54
|
+
*/ epochHeight;
|
|
55
|
+
maxEpochsToKeepResultsFor;
|
|
56
|
+
requestQueue;
|
|
57
|
+
started;
|
|
58
|
+
constructor(database, { jobTimeoutMs = 30_000, timeoutIntervalMs = 10_000, maxRetries = 3, maxEpochsToKeepResultsFor = 1 } = {}, client = getTelemetryClient(), logger = createLogger('prover-client:proving-broker')){
|
|
59
|
+
this.database = database;
|
|
60
|
+
this.logger = logger;
|
|
61
|
+
this.queues = {
|
|
62
|
+
[ProvingRequestType.PUBLIC_VM]: new PriorityMemoryQueue(provingJobComparator),
|
|
63
|
+
[ProvingRequestType.TUBE_PROOF]: new PriorityMemoryQueue(provingJobComparator),
|
|
64
|
+
[ProvingRequestType.PRIVATE_BASE_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
|
|
65
|
+
[ProvingRequestType.PUBLIC_BASE_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
|
|
66
|
+
[ProvingRequestType.MERGE_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
|
|
67
|
+
[ProvingRequestType.ROOT_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
|
|
68
|
+
[ProvingRequestType.BLOCK_MERGE_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
|
|
69
|
+
[ProvingRequestType.BLOCK_ROOT_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
|
|
70
|
+
[ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
|
|
71
|
+
[ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP]: new PriorityMemoryQueue(provingJobComparator),
|
|
72
|
+
[ProvingRequestType.BASE_PARITY]: new PriorityMemoryQueue(provingJobComparator),
|
|
73
|
+
[ProvingRequestType.ROOT_PARITY]: new PriorityMemoryQueue(provingJobComparator)
|
|
74
|
+
};
|
|
75
|
+
this.jobsCache = new Map();
|
|
76
|
+
this.resultsCache = new Map();
|
|
77
|
+
this.enqueuedAt = new Map();
|
|
78
|
+
this.inProgress = new Map();
|
|
79
|
+
this.retries = new Map();
|
|
80
|
+
this.promises = new Map();
|
|
81
|
+
this.msTimeSource = ()=>Date.now();
|
|
82
|
+
this.completedJobNotifications = [];
|
|
83
|
+
this.epochHeight = 0;
|
|
84
|
+
this.maxEpochsToKeepResultsFor = 1;
|
|
85
|
+
this.requestQueue = new SerialQueue();
|
|
86
|
+
this.started = false;
|
|
87
|
+
this.measureQueueDepth = (type)=>{
|
|
88
|
+
return this.queues[type].length();
|
|
89
|
+
};
|
|
90
|
+
this.countActiveJobs = (type)=>{
|
|
91
|
+
let count = 0;
|
|
92
|
+
for (const { id } of this.inProgress.values()){
|
|
93
|
+
const job = this.jobsCache.get(id);
|
|
94
|
+
if (job?.type === type) {
|
|
95
|
+
count++;
|
|
155
96
|
}
|
|
156
97
|
}
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
const inProgressEntries = Array.from(this.inProgress.entries());
|
|
182
|
-
for (const [id, metadata] of inProgressEntries) {
|
|
183
|
-
const item = this.jobsCache.get(id);
|
|
184
|
-
if (!item) {
|
|
185
|
-
this.logger.warn(`Proving job id=${id} not found. Removing it from the queue.`, { provingJobId: id });
|
|
186
|
-
this.inProgress.delete(id);
|
|
187
|
-
continue;
|
|
188
|
-
}
|
|
189
|
-
const now = this.msTimeSource();
|
|
190
|
-
const msSinceLastUpdate = now - metadata.lastUpdatedAt;
|
|
191
|
-
if (msSinceLastUpdate >= this.jobTimeoutMs) {
|
|
192
|
-
this.logger.warn(`Proving job id=${id} timed out. Adding it back to the queue.`, { provingJobId: id });
|
|
193
|
-
this.inProgress.delete(id);
|
|
194
|
-
this.enqueueJobInternal(item);
|
|
195
|
-
this.instrumentation.incTimedOutJobs(item.type);
|
|
196
|
-
}
|
|
197
|
-
}
|
|
198
|
-
}
|
|
199
|
-
enqueueJobInternal(job) {
|
|
200
|
-
if (!this.promises.has(job.id)) {
|
|
201
|
-
this.promises.set(job.id, promiseWithResolvers());
|
|
202
|
-
}
|
|
203
|
-
this.queues[job.type].put({
|
|
204
|
-
epochNumber: job.epochNumber,
|
|
205
|
-
id: job.id,
|
|
206
|
-
});
|
|
207
|
-
this.enqueuedAt.set(job.id, new Timer());
|
|
208
|
-
this.epochHeight = Math.max(this.epochHeight, job.epochNumber);
|
|
209
|
-
}
|
|
210
|
-
isJobStale(job) {
|
|
211
|
-
return job.epochNumber < this.oldestEpochToKeep();
|
|
212
|
-
}
|
|
213
|
-
oldestEpochToKeep() {
|
|
214
|
-
return this.epochHeight - this.maxEpochsToKeepResultsFor;
|
|
215
|
-
}
|
|
216
|
-
},
|
|
217
|
-
_ProvingBroker_instances = new WeakSet(),
|
|
218
|
-
_ProvingBroker_enqueueProvingJob = async function _ProvingBroker_enqueueProvingJob(job) {
|
|
219
|
-
// We return the job status at the start of this call
|
|
220
|
-
const jobStatus = await __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_getProvingJobStatus).call(this, job.id);
|
|
221
|
-
if (this.jobsCache.has(job.id)) {
|
|
222
|
-
const existing = this.jobsCache.get(job.id);
|
|
223
|
-
assert.deepStrictEqual(job, existing, 'Duplicate proving job ID');
|
|
224
|
-
this.logger.debug(`Duplicate proving job id=${job.id} epochNumber=${job.epochNumber}. Ignoring`, {
|
|
225
|
-
provingJobId: job.id,
|
|
226
|
-
});
|
|
227
|
-
return jobStatus;
|
|
228
|
-
}
|
|
229
|
-
if (this.isJobStale(job)) {
|
|
230
|
-
this.logger.warn(`Tried enqueueing stale proving job id=${job.id} epochNumber=${job.epochNumber}`, {
|
|
231
|
-
provingJobId: job.id,
|
|
232
|
-
});
|
|
233
|
-
throw new Error(`Epoch too old: job epoch ${job.epochNumber}, current epoch: ${this.epochHeight}`);
|
|
234
|
-
}
|
|
235
|
-
this.logger.info(`New proving job id=${job.id} epochNumber=${job.epochNumber}`, { provingJobId: job.id });
|
|
236
|
-
try {
|
|
237
|
-
// do this first so it acts as a "lock". If this job is enqueued again while we're saving it the if at the top will catch it.
|
|
238
|
-
this.jobsCache.set(job.id, job);
|
|
239
|
-
await this.database.addProvingJob(job);
|
|
240
|
-
this.enqueueJobInternal(job);
|
|
241
|
-
}
|
|
242
|
-
catch (err) {
|
|
243
|
-
this.logger.error(`Failed to save proving job id=${job.id}: ${err}`, err, { provingJobId: job.id });
|
|
244
|
-
this.jobsCache.delete(job.id);
|
|
245
|
-
throw err;
|
|
246
|
-
}
|
|
247
|
-
return jobStatus;
|
|
248
|
-
},
|
|
249
|
-
_ProvingBroker_cancelProvingJob = async function _ProvingBroker_cancelProvingJob(id) {
|
|
250
|
-
if (!this.jobsCache.has(id)) {
|
|
251
|
-
this.logger.warn(`Can't cancel a job that doesn't exist id=${id}`, { provingJobId: id });
|
|
252
|
-
return;
|
|
253
|
-
}
|
|
254
|
-
// notify listeners of the cancellation
|
|
255
|
-
if (!this.resultsCache.has(id)) {
|
|
256
|
-
this.logger.info(`Cancelling job id=${id}`, { provingJobId: id });
|
|
257
|
-
await __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_reportProvingJobError).call(this, id, 'Aborted', false);
|
|
258
|
-
}
|
|
259
|
-
},
|
|
260
|
-
_ProvingBroker_getProvingJobStatus = function _ProvingBroker_getProvingJobStatus(id) {
|
|
261
|
-
const result = this.resultsCache.get(id);
|
|
98
|
+
return count;
|
|
99
|
+
};
|
|
100
|
+
this.tracer = client.getTracer('ProvingBroker');
|
|
101
|
+
this.instrumentation = new ProvingBrokerInstrumentation(client);
|
|
102
|
+
this.cleanupPromise = new RunningPromise(this.cleanupPass.bind(this), this.logger, timeoutIntervalMs);
|
|
103
|
+
this.jobTimeoutMs = jobTimeoutMs;
|
|
104
|
+
this.maxRetries = maxRetries;
|
|
105
|
+
this.maxEpochsToKeepResultsFor = maxEpochsToKeepResultsFor;
|
|
106
|
+
}
|
|
107
|
+
measureQueueDepth;
|
|
108
|
+
countActiveJobs;
|
|
109
|
+
async start() {
|
|
110
|
+
if (this.started) {
|
|
111
|
+
this.logger.info('Proving Broker already started');
|
|
112
|
+
return Promise.resolve();
|
|
113
|
+
}
|
|
114
|
+
this.logger.info('Proving Broker started');
|
|
115
|
+
for await (const [item, result] of this.database.allProvingJobs()){
|
|
116
|
+
this.logger.info(`Restoring proving job id=${item.id} settled=${!!result}`, {
|
|
117
|
+
provingJobId: item.id,
|
|
118
|
+
status: result ? result.status : 'pending'
|
|
119
|
+
});
|
|
120
|
+
this.jobsCache.set(item.id, item);
|
|
121
|
+
this.promises.set(item.id, promiseWithResolvers());
|
|
262
122
|
if (result) {
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
else {
|
|
266
|
-
|
|
267
|
-
const item = this.jobsCache.get(id);
|
|
268
|
-
if (!item) {
|
|
269
|
-
return Promise.resolve({ status: 'not-found' });
|
|
270
|
-
}
|
|
271
|
-
return Promise.resolve({ status: this.inProgress.has(id) ? 'in-progress' : 'in-queue' });
|
|
272
|
-
}
|
|
273
|
-
},
|
|
274
|
-
_ProvingBroker_getCompletedJobs = function _ProvingBroker_getCompletedJobs(ids) {
|
|
275
|
-
const completedJobs = ids.filter(id => this.resultsCache.has(id));
|
|
276
|
-
const notifications = this.completedJobNotifications;
|
|
277
|
-
this.completedJobNotifications = [];
|
|
278
|
-
return Promise.resolve(notifications.concat(completedJobs));
|
|
279
|
-
},
|
|
280
|
-
_ProvingBroker_getProvingJob =
|
|
281
|
-
// eslint-disable-next-line require-await
|
|
282
|
-
async function _ProvingBroker_getProvingJob(filter = { allowList: [] }) {
|
|
283
|
-
const allowedProofs = Array.isArray(filter.allowList) && filter.allowList.length > 0
|
|
284
|
-
? [...filter.allowList]
|
|
285
|
-
: Object.values(ProvingRequestType).filter((x) => typeof x === 'number');
|
|
286
|
-
allowedProofs.sort(proofTypeComparator);
|
|
287
|
-
for (const proofType of allowedProofs) {
|
|
288
|
-
const queue = this.queues[proofType];
|
|
289
|
-
let enqueuedJob;
|
|
290
|
-
// exhaust the queue and make sure we're not sending a job that's already in progress
|
|
291
|
-
// or has already been completed
|
|
292
|
-
// this can happen if the broker crashes and restarts
|
|
293
|
-
// it's possible agents will report progress or results for jobs that are in the queue (after the restart)
|
|
294
|
-
while ((enqueuedJob = queue.getImmediate())) {
|
|
295
|
-
const job = this.jobsCache.get(enqueuedJob.id);
|
|
296
|
-
if (job && !this.inProgress.has(enqueuedJob.id) && !this.resultsCache.has(enqueuedJob.id)) {
|
|
297
|
-
const time = this.msTimeSource();
|
|
298
|
-
this.inProgress.set(job.id, {
|
|
299
|
-
id: job.id,
|
|
300
|
-
startedAt: time,
|
|
301
|
-
lastUpdatedAt: time,
|
|
302
|
-
});
|
|
303
|
-
const enqueuedAt = this.enqueuedAt.get(job.id);
|
|
304
|
-
if (enqueuedAt) {
|
|
305
|
-
this.instrumentation.recordJobWait(job.type, enqueuedAt);
|
|
306
|
-
}
|
|
307
|
-
return { job, time };
|
|
308
|
-
}
|
|
309
|
-
}
|
|
123
|
+
this.promises.get(item.id).resolve(result);
|
|
124
|
+
this.resultsCache.set(item.id, result);
|
|
125
|
+
} else {
|
|
126
|
+
this.enqueueJobInternal(item);
|
|
310
127
|
}
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
128
|
+
}
|
|
129
|
+
this.cleanupPromise.start();
|
|
130
|
+
this.requestQueue.start();
|
|
131
|
+
this.instrumentation.monitorQueueDepth(this.measureQueueDepth);
|
|
132
|
+
this.instrumentation.monitorActiveJobs(this.countActiveJobs);
|
|
133
|
+
this.started = true;
|
|
134
|
+
}
|
|
135
|
+
async stop() {
|
|
136
|
+
if (!this.started) {
|
|
137
|
+
this.logger.warn('ProvingBroker not started');
|
|
138
|
+
return Promise.resolve();
|
|
139
|
+
}
|
|
140
|
+
await this.requestQueue.cancel();
|
|
141
|
+
await this.cleanupPromise.stop();
|
|
142
|
+
}
|
|
143
|
+
enqueueProvingJob(job) {
|
|
144
|
+
return this.requestQueue.put(()=>this.#enqueueProvingJob(job));
|
|
145
|
+
}
|
|
146
|
+
cancelProvingJob(id) {
|
|
147
|
+
return this.requestQueue.put(()=>this.#cancelProvingJob(id));
|
|
148
|
+
}
|
|
149
|
+
getProvingJobStatus(id) {
|
|
150
|
+
return this.requestQueue.put(()=>this.#getProvingJobStatus(id));
|
|
151
|
+
}
|
|
152
|
+
getCompletedJobs(ids) {
|
|
153
|
+
return this.requestQueue.put(()=>this.#getCompletedJobs(ids));
|
|
154
|
+
}
|
|
155
|
+
getProvingJob(filter) {
|
|
156
|
+
return this.requestQueue.put(()=>this.#getProvingJob(filter));
|
|
157
|
+
}
|
|
158
|
+
reportProvingJobSuccess(id, value, filter) {
|
|
159
|
+
return this.requestQueue.put(()=>this.#reportProvingJobSuccess(id, value, filter));
|
|
160
|
+
}
|
|
161
|
+
reportProvingJobError(id, err, retry = false, filter) {
|
|
162
|
+
return this.requestQueue.put(()=>this.#reportProvingJobError(id, err, retry, filter));
|
|
163
|
+
}
|
|
164
|
+
reportProvingJobProgress(id, startedAt, filter) {
|
|
165
|
+
return this.requestQueue.put(()=>this.#reportProvingJobProgress(id, startedAt, filter));
|
|
166
|
+
}
|
|
167
|
+
async #enqueueProvingJob(job) {
|
|
168
|
+
// We return the job status at the start of this call
|
|
169
|
+
const jobStatus = await this.#getProvingJobStatus(job.id);
|
|
170
|
+
if (this.jobsCache.has(job.id)) {
|
|
171
|
+
const existing = this.jobsCache.get(job.id);
|
|
172
|
+
assert.deepStrictEqual(job, existing, 'Duplicate proving job ID');
|
|
173
|
+
this.logger.debug(`Duplicate proving job id=${job.id} epochNumber=${job.epochNumber}. Ignoring`, {
|
|
174
|
+
provingJobId: job.id
|
|
175
|
+
});
|
|
176
|
+
return jobStatus;
|
|
177
|
+
}
|
|
178
|
+
if (this.isJobStale(job)) {
|
|
179
|
+
this.logger.warn(`Tried enqueueing stale proving job id=${job.id} epochNumber=${job.epochNumber}`, {
|
|
180
|
+
provingJobId: job.id
|
|
181
|
+
});
|
|
182
|
+
throw new Error(`Epoch too old: job epoch ${job.epochNumber}, current epoch: ${this.epochHeight}`);
|
|
183
|
+
}
|
|
184
|
+
this.logger.info(`New proving job id=${job.id} epochNumber=${job.epochNumber}`, {
|
|
185
|
+
provingJobId: job.id
|
|
186
|
+
});
|
|
187
|
+
try {
|
|
188
|
+
// do this first so it acts as a "lock". If this job is enqueued again while we're saving it the if at the top will catch it.
|
|
189
|
+
this.jobsCache.set(job.id, job);
|
|
190
|
+
await this.database.addProvingJob(job);
|
|
191
|
+
this.enqueueJobInternal(job);
|
|
192
|
+
} catch (err) {
|
|
193
|
+
this.logger.error(`Failed to save proving job id=${job.id}: ${err}`, err, {
|
|
194
|
+
provingJobId: job.id
|
|
195
|
+
});
|
|
196
|
+
this.jobsCache.delete(job.id);
|
|
197
|
+
throw err;
|
|
198
|
+
}
|
|
199
|
+
return jobStatus;
|
|
200
|
+
}
|
|
201
|
+
async #cancelProvingJob(id) {
|
|
202
|
+
if (!this.jobsCache.has(id)) {
|
|
203
|
+
this.logger.warn(`Can't cancel a job that doesn't exist id=${id}`, {
|
|
204
|
+
provingJobId: id
|
|
205
|
+
});
|
|
206
|
+
return;
|
|
207
|
+
}
|
|
208
|
+
// notify listeners of the cancellation
|
|
209
|
+
if (!this.resultsCache.has(id)) {
|
|
210
|
+
this.logger.info(`Cancelling job id=${id}`, {
|
|
211
|
+
provingJobId: id
|
|
212
|
+
});
|
|
213
|
+
await this.#reportProvingJobError(id, 'Aborted', false);
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
cleanUpProvingJobState(ids) {
|
|
217
|
+
for (const id of ids){
|
|
218
|
+
this.jobsCache.delete(id);
|
|
219
|
+
this.promises.delete(id);
|
|
220
|
+
this.resultsCache.delete(id);
|
|
221
|
+
this.inProgress.delete(id);
|
|
222
|
+
this.retries.delete(id);
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
#getProvingJobStatus(id) {
|
|
226
|
+
const result = this.resultsCache.get(id);
|
|
227
|
+
if (result) {
|
|
228
|
+
return Promise.resolve(result);
|
|
229
|
+
} else {
|
|
230
|
+
// no result yet, check if we know the item
|
|
315
231
|
const item = this.jobsCache.get(id);
|
|
316
|
-
const retries = this.retries.get(id) ?? 0;
|
|
317
232
|
if (!item) {
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
}
|
|
321
|
-
if (!info) {
|
|
322
|
-
this.logger.warn(`Proving job id=${id} type=${ProvingRequestType[item.type]} not in the in-progress set`, {
|
|
323
|
-
provingJobId: id,
|
|
233
|
+
return Promise.resolve({
|
|
234
|
+
status: 'not-found'
|
|
324
235
|
});
|
|
325
236
|
}
|
|
326
|
-
|
|
327
|
-
this.inProgress.
|
|
237
|
+
return Promise.resolve({
|
|
238
|
+
status: this.inProgress.has(id) ? 'in-progress' : 'in-queue'
|
|
239
|
+
});
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
#getCompletedJobs(ids) {
|
|
243
|
+
const completedJobs = ids.filter((id)=>this.resultsCache.has(id));
|
|
244
|
+
const notifications = this.completedJobNotifications;
|
|
245
|
+
this.completedJobNotifications = [];
|
|
246
|
+
return Promise.resolve(notifications.concat(completedJobs));
|
|
247
|
+
}
|
|
248
|
+
// eslint-disable-next-line require-await
|
|
249
|
+
#getProvingJob(filter = {
|
|
250
|
+
allowList: []
|
|
251
|
+
}) {
|
|
252
|
+
const allowedProofs = Array.isArray(filter.allowList) && filter.allowList.length > 0 ? [
|
|
253
|
+
...filter.allowList
|
|
254
|
+
] : Object.values(ProvingRequestType).filter((x)=>typeof x === 'number');
|
|
255
|
+
allowedProofs.sort(proofTypeComparator);
|
|
256
|
+
for (const proofType of allowedProofs){
|
|
257
|
+
const queue = this.queues[proofType];
|
|
258
|
+
let enqueuedJob;
|
|
259
|
+
// exhaust the queue and make sure we're not sending a job that's already in progress
|
|
260
|
+
// or has already been completed
|
|
261
|
+
// this can happen if the broker crashes and restarts
|
|
262
|
+
// it's possible agents will report progress or results for jobs that are in the queue (after the restart)
|
|
263
|
+
while(enqueuedJob = queue.getImmediate()){
|
|
264
|
+
const job = this.jobsCache.get(enqueuedJob.id);
|
|
265
|
+
if (job && !this.inProgress.has(enqueuedJob.id) && !this.resultsCache.has(enqueuedJob.id)) {
|
|
266
|
+
const time = this.msTimeSource();
|
|
267
|
+
this.inProgress.set(job.id, {
|
|
268
|
+
id: job.id,
|
|
269
|
+
startedAt: time,
|
|
270
|
+
lastUpdatedAt: time
|
|
271
|
+
});
|
|
272
|
+
const enqueuedAt = this.enqueuedAt.get(job.id);
|
|
273
|
+
if (enqueuedAt) {
|
|
274
|
+
this.instrumentation.recordJobWait(job.type, enqueuedAt);
|
|
275
|
+
}
|
|
276
|
+
return {
|
|
277
|
+
job,
|
|
278
|
+
time
|
|
279
|
+
};
|
|
280
|
+
}
|
|
328
281
|
}
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
282
|
+
}
|
|
283
|
+
return undefined;
|
|
284
|
+
}
|
|
285
|
+
async #reportProvingJobError(id, err, retry = false, filter) {
|
|
286
|
+
const info = this.inProgress.get(id);
|
|
287
|
+
const item = this.jobsCache.get(id);
|
|
288
|
+
const retries = this.retries.get(id) ?? 0;
|
|
289
|
+
if (!item) {
|
|
290
|
+
this.logger.warn(`Can't set error on unknown proving job id=${id} err=${err}`, {
|
|
291
|
+
provingJoId: id
|
|
292
|
+
});
|
|
293
|
+
return;
|
|
294
|
+
}
|
|
295
|
+
if (!info) {
|
|
296
|
+
this.logger.warn(`Proving job id=${id} type=${ProvingRequestType[item.type]} not in the in-progress set`, {
|
|
297
|
+
provingJobId: id
|
|
298
|
+
});
|
|
299
|
+
} else {
|
|
300
|
+
this.inProgress.delete(id);
|
|
301
|
+
}
|
|
302
|
+
if (this.resultsCache.has(id)) {
|
|
303
|
+
this.logger.warn(`Proving job id=${id} is already settled, ignoring err=${err}`, {
|
|
304
|
+
provingJobId: id
|
|
305
|
+
});
|
|
306
|
+
return this.#getProvingJob(filter);
|
|
307
|
+
}
|
|
308
|
+
if (retry && retries + 1 < this.maxRetries && !this.isJobStale(item)) {
|
|
309
|
+
this.logger.info(`Retrying proving job id=${id} type=${ProvingRequestType[item.type]} retry=${retries + 1} err=${err}`, {
|
|
310
|
+
provingJobId: id
|
|
311
|
+
});
|
|
312
|
+
// assign another job to this agent
|
|
313
|
+
// do this first, before we put the failed job back in the queue
|
|
314
|
+
const maybeAnotherJob = this.#getProvingJob(filter);
|
|
315
|
+
this.retries.set(id, retries + 1);
|
|
316
|
+
this.enqueueJobInternal(item);
|
|
317
|
+
this.instrumentation.incRetriedJobs(item.type);
|
|
318
|
+
return maybeAnotherJob;
|
|
319
|
+
}
|
|
320
|
+
this.logger.info(`Marking proving job as failed id=${id} type=${ProvingRequestType[item.type]} totalAttempts=${retries + 1} err=${err}`, {
|
|
321
|
+
provingJobId: id
|
|
322
|
+
});
|
|
323
|
+
// save the result to the cache and notify clients of the job status
|
|
324
|
+
// this should work even if our database breaks because the result is cached in memory
|
|
325
|
+
const result = {
|
|
326
|
+
status: 'rejected',
|
|
327
|
+
reason: String(err)
|
|
328
|
+
};
|
|
329
|
+
this.resultsCache.set(id, result);
|
|
330
|
+
this.promises.get(id).resolve(result);
|
|
331
|
+
this.completedJobNotifications.push(id);
|
|
332
|
+
this.instrumentation.incRejectedJobs(item.type);
|
|
333
|
+
if (info) {
|
|
334
|
+
const duration = this.msTimeSource() - info.startedAt;
|
|
335
|
+
this.instrumentation.recordJobDuration(item.type, duration);
|
|
336
|
+
}
|
|
337
|
+
try {
|
|
338
|
+
await this.database.setProvingJobError(id, err);
|
|
339
|
+
} catch (saveErr) {
|
|
340
|
+
this.logger.error(`Failed to save proving job error status id=${id} jobErr=${err}`, saveErr, {
|
|
341
|
+
provingJobId: id
|
|
342
|
+
});
|
|
343
|
+
throw saveErr;
|
|
344
|
+
}
|
|
345
|
+
return this.#getProvingJob(filter);
|
|
346
|
+
}
|
|
347
|
+
#reportProvingJobProgress(id, startedAt, filter) {
|
|
348
|
+
const job = this.jobsCache.get(id);
|
|
349
|
+
if (!job) {
|
|
350
|
+
this.logger.warn(`Proving job id=${id} does not exist`, {
|
|
351
|
+
provingJobId: id
|
|
352
|
+
});
|
|
353
|
+
return this.#getProvingJob(filter);
|
|
354
|
+
}
|
|
355
|
+
if (this.resultsCache.has(id)) {
|
|
356
|
+
this.logger.warn(`Proving job id=${id} has already been completed`, {
|
|
357
|
+
provingJobId: id
|
|
358
|
+
});
|
|
359
|
+
return this.#getProvingJob(filter);
|
|
360
|
+
}
|
|
361
|
+
const metadata = this.inProgress.get(id);
|
|
362
|
+
const now = this.msTimeSource();
|
|
363
|
+
if (!metadata) {
|
|
364
|
+
this.logger.warn(`Proving job id=${id} type=${ProvingRequestType[job.type]} not found in the in-progress cache, adding it`, {
|
|
365
|
+
provingJobId: id
|
|
366
|
+
});
|
|
367
|
+
// the queue will still contain the item at this point!
|
|
368
|
+
// we need to be careful when popping off the queue to make sure we're not sending
|
|
369
|
+
// a job that's already in progress
|
|
370
|
+
this.inProgress.set(id, {
|
|
371
|
+
id,
|
|
372
|
+
startedAt,
|
|
373
|
+
lastUpdatedAt: this.msTimeSource()
|
|
374
|
+
});
|
|
375
|
+
return undefined;
|
|
376
|
+
} else if (startedAt <= metadata.startedAt) {
|
|
377
|
+
if (startedAt < metadata.startedAt) {
|
|
378
|
+
this.logger.info(`Proving job id=${id} type=${ProvingRequestType[job.type]} startedAt=${startedAt} older agent has taken job`, {
|
|
379
|
+
provingJobId: id
|
|
332
380
|
});
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
this.logger.info(`Retrying proving job id=${id} type=${ProvingRequestType[item.type]} retry=${retries + 1} err=${err}`, {
|
|
337
|
-
provingJobId: id,
|
|
381
|
+
} else {
|
|
382
|
+
this.logger.debug(`Proving job id=${id} type=${ProvingRequestType[job.type]} heartbeat`, {
|
|
383
|
+
provingJobId: id
|
|
338
384
|
});
|
|
339
|
-
this.retries.set(id, retries + 1);
|
|
340
|
-
this.enqueueJobInternal(item);
|
|
341
|
-
this.instrumentation.incRetriedJobs(item.type);
|
|
342
|
-
return;
|
|
343
385
|
}
|
|
344
|
-
|
|
345
|
-
|
|
386
|
+
metadata.startedAt = startedAt;
|
|
387
|
+
metadata.lastUpdatedAt = now;
|
|
388
|
+
return undefined;
|
|
389
|
+
}
|
|
390
|
+
this.logger.warn(`Proving job id=${id} type=${ProvingRequestType[job.type]} already being worked on by another agent. Sending new one`, {
|
|
391
|
+
provingJobId: id
|
|
392
|
+
});
|
|
393
|
+
return this.#getProvingJob(filter);
|
|
394
|
+
}
|
|
395
|
+
async #reportProvingJobSuccess(id, value, filter) {
|
|
396
|
+
const info = this.inProgress.get(id);
|
|
397
|
+
const item = this.jobsCache.get(id);
|
|
398
|
+
const retries = this.retries.get(id) ?? 0;
|
|
399
|
+
if (!item) {
|
|
400
|
+
this.logger.warn(`Proving job id=${id} not found`, {
|
|
401
|
+
provingJobId: id
|
|
346
402
|
});
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
this.
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
}
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
403
|
+
return;
|
|
404
|
+
}
|
|
405
|
+
if (!info) {
|
|
406
|
+
this.logger.warn(`Proving job id=${id} type=${ProvingRequestType[item.type]} not in the in-progress set`, {
|
|
407
|
+
provingJobId: id
|
|
408
|
+
});
|
|
409
|
+
} else {
|
|
410
|
+
this.inProgress.delete(id);
|
|
411
|
+
}
|
|
412
|
+
if (this.resultsCache.has(id)) {
|
|
413
|
+
this.logger.warn(`Proving job id=${id} already settled, ignoring result`, {
|
|
414
|
+
provingJobId: id
|
|
415
|
+
});
|
|
416
|
+
return;
|
|
417
|
+
}
|
|
418
|
+
this.logger.info(`Proving job complete id=${id} type=${ProvingRequestType[item.type]} totalAttempts=${retries + 1}`, {
|
|
419
|
+
provingJobId: id
|
|
420
|
+
});
|
|
421
|
+
// save result to our local cache and notify clients
|
|
422
|
+
// if save to database fails, that's ok because we have the result in memory
|
|
423
|
+
// if the broker crashes and needs the result again, we're covered because we can just recompute it
|
|
424
|
+
const result = {
|
|
425
|
+
status: 'fulfilled',
|
|
426
|
+
value
|
|
427
|
+
};
|
|
428
|
+
this.resultsCache.set(id, result);
|
|
429
|
+
this.promises.get(id).resolve(result);
|
|
430
|
+
this.completedJobNotifications.push(id);
|
|
431
|
+
this.instrumentation.incResolvedJobs(item.type);
|
|
432
|
+
if (info) {
|
|
433
|
+
const duration = this.msTimeSource() - info.startedAt;
|
|
434
|
+
this.instrumentation.recordJobDuration(item.type, duration);
|
|
435
|
+
}
|
|
436
|
+
try {
|
|
437
|
+
await this.database.setProvingJobResult(id, value);
|
|
438
|
+
} catch (saveErr) {
|
|
439
|
+
this.logger.error(`Failed to save proving job result id=${id}`, saveErr, {
|
|
440
|
+
provingJobId: id
|
|
441
|
+
});
|
|
442
|
+
throw saveErr;
|
|
443
|
+
}
|
|
444
|
+
return this.#getProvingJob(filter);
|
|
445
|
+
}
|
|
446
|
+
async cleanupPass() {
|
|
447
|
+
this.cleanupStaleJobs();
|
|
448
|
+
this.reEnqueueExpiredJobs();
|
|
449
|
+
const oldestEpochToKeep = this.oldestEpochToKeep();
|
|
450
|
+
if (oldestEpochToKeep > 0) {
|
|
451
|
+
await this.requestQueue.put(()=>this.database.deleteAllProvingJobsOlderThanEpoch(oldestEpochToKeep));
|
|
452
|
+
this.logger.trace(`Deleted all epochs older than ${oldestEpochToKeep}`);
|
|
453
|
+
}
|
|
454
|
+
}
|
|
455
|
+
cleanupStaleJobs() {
|
|
456
|
+
const jobIds = Array.from(this.jobsCache.keys());
|
|
457
|
+
const jobsToClean = [];
|
|
458
|
+
for (const id of jobIds){
|
|
369
459
|
const job = this.jobsCache.get(id);
|
|
370
|
-
if (
|
|
371
|
-
|
|
372
|
-
return filter ? __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_getProvingJob).call(this, filter) : Promise.resolve(undefined);
|
|
373
|
-
}
|
|
374
|
-
if (this.resultsCache.has(id)) {
|
|
375
|
-
this.logger.warn(`Proving job id=${id} has already been completed`, { provingJobId: id });
|
|
376
|
-
return filter ? __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_getProvingJob).call(this, filter) : Promise.resolve(undefined);
|
|
377
|
-
}
|
|
378
|
-
const metadata = this.inProgress.get(id);
|
|
379
|
-
const now = this.msTimeSource();
|
|
380
|
-
if (!metadata) {
|
|
381
|
-
this.logger.warn(`Proving job id=${id} type=${ProvingRequestType[job.type]} not found in the in-progress cache, adding it`, { provingJobId: id });
|
|
382
|
-
// the queue will still contain the item at this point!
|
|
383
|
-
// we need to be careful when popping off the queue to make sure we're not sending
|
|
384
|
-
// a job that's already in progress
|
|
385
|
-
this.inProgress.set(id, {
|
|
386
|
-
id,
|
|
387
|
-
startedAt,
|
|
388
|
-
lastUpdatedAt: this.msTimeSource(),
|
|
389
|
-
});
|
|
390
|
-
return Promise.resolve(undefined);
|
|
391
|
-
}
|
|
392
|
-
else if (startedAt <= metadata.startedAt) {
|
|
393
|
-
if (startedAt < metadata.startedAt) {
|
|
394
|
-
this.logger.info(`Proving job id=${id} type=${ProvingRequestType[job.type]} startedAt=${startedAt} older agent has taken job`, { provingJobId: id });
|
|
395
|
-
}
|
|
396
|
-
else {
|
|
397
|
-
this.logger.debug(`Proving job id=${id} type=${ProvingRequestType[job.type]} heartbeat`, { provingJobId: id });
|
|
398
|
-
}
|
|
399
|
-
metadata.startedAt = startedAt;
|
|
400
|
-
metadata.lastUpdatedAt = now;
|
|
401
|
-
return Promise.resolve(undefined);
|
|
402
|
-
}
|
|
403
|
-
else if (filter) {
|
|
404
|
-
this.logger.warn(`Proving job id=${id} type=${ProvingRequestType[job.type]} already being worked on by another agent. Sending new one`, { provingJobId: id });
|
|
405
|
-
return __classPrivateFieldGet(this, _ProvingBroker_instances, "m", _ProvingBroker_getProvingJob).call(this, filter);
|
|
406
|
-
}
|
|
407
|
-
else {
|
|
408
|
-
return Promise.resolve(undefined);
|
|
460
|
+
if (this.isJobStale(job)) {
|
|
461
|
+
jobsToClean.push(id);
|
|
409
462
|
}
|
|
410
|
-
}
|
|
411
|
-
|
|
412
|
-
|
|
463
|
+
}
|
|
464
|
+
if (jobsToClean.length > 0) {
|
|
465
|
+
this.cleanUpProvingJobState(jobsToClean);
|
|
466
|
+
this.logger.info(`Cleaned up jobs=${jobsToClean.length}`);
|
|
467
|
+
}
|
|
468
|
+
}
|
|
469
|
+
reEnqueueExpiredJobs() {
|
|
470
|
+
const inProgressEntries = Array.from(this.inProgress.entries());
|
|
471
|
+
for (const [id, metadata] of inProgressEntries){
|
|
413
472
|
const item = this.jobsCache.get(id);
|
|
414
|
-
const retries = this.retries.get(id) ?? 0;
|
|
415
473
|
if (!item) {
|
|
416
|
-
this.logger.warn(`Proving job id=${id} not found
|
|
417
|
-
|
|
418
|
-
}
|
|
419
|
-
if (!info) {
|
|
420
|
-
this.logger.warn(`Proving job id=${id} type=${ProvingRequestType[item.type]} not in the in-progress set`, {
|
|
421
|
-
provingJobId: id,
|
|
474
|
+
this.logger.warn(`Proving job id=${id} not found. Removing it from the queue.`, {
|
|
475
|
+
provingJobId: id
|
|
422
476
|
});
|
|
423
|
-
}
|
|
424
|
-
else {
|
|
425
477
|
this.inProgress.delete(id);
|
|
478
|
+
continue;
|
|
426
479
|
}
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
// save result to our local cache and notify clients
|
|
433
|
-
// if save to database fails, that's ok because we have the result in memory
|
|
434
|
-
// if the broker crashes and needs the result again, we're covered because we can just recompute it
|
|
435
|
-
const result = { status: 'fulfilled', value };
|
|
436
|
-
this.resultsCache.set(id, result);
|
|
437
|
-
this.promises.get(id).resolve(result);
|
|
438
|
-
this.completedJobNotifications.push(id);
|
|
439
|
-
this.instrumentation.incResolvedJobs(item.type);
|
|
440
|
-
if (info) {
|
|
441
|
-
const duration = this.msTimeSource() - info.startedAt;
|
|
442
|
-
this.instrumentation.recordJobDuration(item.type, duration);
|
|
443
|
-
}
|
|
444
|
-
try {
|
|
445
|
-
await this.database.setProvingJobResult(id, value);
|
|
446
|
-
}
|
|
447
|
-
catch (saveErr) {
|
|
448
|
-
this.logger.error(`Failed to save proving job result id=${id}`, saveErr, {
|
|
449
|
-
provingJobId: id,
|
|
480
|
+
const now = this.msTimeSource();
|
|
481
|
+
const msSinceLastUpdate = now - metadata.lastUpdatedAt;
|
|
482
|
+
if (msSinceLastUpdate >= this.jobTimeoutMs) {
|
|
483
|
+
this.logger.warn(`Proving job id=${id} timed out. Adding it back to the queue.`, {
|
|
484
|
+
provingJobId: id
|
|
450
485
|
});
|
|
451
|
-
|
|
486
|
+
this.inProgress.delete(id);
|
|
487
|
+
this.enqueueJobInternal(item);
|
|
488
|
+
this.instrumentation.incTimedOutJobs(item.type);
|
|
452
489
|
}
|
|
453
|
-
}
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
490
|
+
}
|
|
491
|
+
}
|
|
492
|
+
enqueueJobInternal(job) {
|
|
493
|
+
if (!this.promises.has(job.id)) {
|
|
494
|
+
this.promises.set(job.id, promiseWithResolvers());
|
|
495
|
+
}
|
|
496
|
+
this.queues[job.type].put({
|
|
497
|
+
epochNumber: job.epochNumber,
|
|
498
|
+
id: job.id
|
|
499
|
+
});
|
|
500
|
+
this.enqueuedAt.set(job.id, new Timer());
|
|
501
|
+
this.epochHeight = Math.max(this.epochHeight, job.epochNumber);
|
|
502
|
+
}
|
|
503
|
+
isJobStale(job) {
|
|
504
|
+
return job.epochNumber < this.oldestEpochToKeep();
|
|
505
|
+
}
|
|
506
|
+
oldestEpochToKeep() {
|
|
507
|
+
return this.epochHeight - this.maxEpochsToKeepResultsFor;
|
|
508
|
+
}
|
|
509
|
+
}
|
|
510
|
+
_ts_decorate([
|
|
511
|
+
trackSpan('ProvingBroker.cleanupPass')
|
|
512
|
+
], ProvingBroker.prototype, "cleanupPass", null);
|
|
463
513
|
/**
|
|
464
514
|
* Compares two proving jobs and selects which one's more important
|
|
465
515
|
* @param a - A proving job
|
|
466
516
|
* @param b - Another proving job
|
|
467
517
|
* @returns A number indicating the relative priority of the two proving jobs
|
|
468
|
-
*/
|
|
469
|
-
function provingJobComparator(a, b) {
|
|
518
|
+
*/ function provingJobComparator(a, b) {
|
|
470
519
|
if (a.epochNumber < b.epochNumber) {
|
|
471
520
|
return -1;
|
|
472
|
-
}
|
|
473
|
-
else if (a.epochNumber > b.epochNumber) {
|
|
521
|
+
} else if (a.epochNumber > b.epochNumber) {
|
|
474
522
|
return 1;
|
|
475
|
-
}
|
|
476
|
-
else {
|
|
523
|
+
} else {
|
|
477
524
|
return 0;
|
|
478
525
|
}
|
|
479
526
|
}
|
|
@@ -484,26 +531,21 @@ function provingJobComparator(a, b) {
|
|
|
484
531
|
* @param a - A proof type
|
|
485
532
|
* @param b - Another proof type
|
|
486
533
|
* @returns A number indicating the relative priority of the two proof types
|
|
487
|
-
*/
|
|
488
|
-
function proofTypeComparator(a, b) {
|
|
534
|
+
*/ function proofTypeComparator(a, b) {
|
|
489
535
|
const indexOfA = PROOF_TYPES_IN_PRIORITY_ORDER.indexOf(a);
|
|
490
536
|
const indexOfB = PROOF_TYPES_IN_PRIORITY_ORDER.indexOf(b);
|
|
491
537
|
if (indexOfA === indexOfB) {
|
|
492
538
|
return 0;
|
|
493
|
-
}
|
|
494
|
-
else if (indexOfA === -1) {
|
|
539
|
+
} else if (indexOfA === -1) {
|
|
495
540
|
// a is some new proof that didn't get added to the array
|
|
496
541
|
// b is more important because we know about it
|
|
497
542
|
return 1;
|
|
498
|
-
}
|
|
499
|
-
else if (indexOfB === -1) {
|
|
543
|
+
} else if (indexOfB === -1) {
|
|
500
544
|
// the opposite of the previous if branch
|
|
501
545
|
return -1;
|
|
502
|
-
}
|
|
503
|
-
else if (indexOfA < indexOfB) {
|
|
546
|
+
} else if (indexOfA < indexOfB) {
|
|
504
547
|
return -1;
|
|
505
|
-
}
|
|
506
|
-
else {
|
|
548
|
+
} else {
|
|
507
549
|
return 1;
|
|
508
550
|
}
|
|
509
551
|
}
|
|
@@ -513,8 +555,7 @@ function proofTypeComparator(a, b) {
|
|
|
513
555
|
*
|
|
514
556
|
* The aim is that this will speed up block proving as the closer we get to a block's root proof the more likely it
|
|
515
557
|
* is to get picked up by agents
|
|
516
|
-
*/
|
|
517
|
-
const PROOF_TYPES_IN_PRIORITY_ORDER = [
|
|
558
|
+
*/ const PROOF_TYPES_IN_PRIORITY_ORDER = [
|
|
518
559
|
ProvingRequestType.BLOCK_ROOT_ROLLUP,
|
|
519
560
|
ProvingRequestType.SINGLE_TX_BLOCK_ROOT_ROLLUP,
|
|
520
561
|
ProvingRequestType.BLOCK_MERGE_ROLLUP,
|
|
@@ -526,6 +567,5 @@ const PROOF_TYPES_IN_PRIORITY_ORDER = [
|
|
|
526
567
|
ProvingRequestType.TUBE_PROOF,
|
|
527
568
|
ProvingRequestType.ROOT_PARITY,
|
|
528
569
|
ProvingRequestType.BASE_PARITY,
|
|
529
|
-
ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP
|
|
570
|
+
ProvingRequestType.EMPTY_BLOCK_ROOT_ROLLUP
|
|
530
571
|
];
|
|
531
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"proving_broker.js","sourceRoot":"","sources":["../../src/proving_broker/proving_broker.ts"],"names":[],"mappings":"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"}
|