diff options
author | Chocobozzz <me@florianbigard.com> | 2022-09-08 12:26:46 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-09-08 12:27:22 +0200 |
commit | 405c83f9af377a663a4c8e9ad025fd5c10496922 (patch) | |
tree | 88062f7d9e23bdf879358963975891387e388e2d | |
parent | d800ec5f36fa8d57f29c577bcf797a79081342d5 (diff) | |
download | PeerTube-405c83f9af377a663a4c8e9ad025fd5c10496922.tar.gz PeerTube-405c83f9af377a663a4c8e9ad025fd5c10496922.tar.zst PeerTube-405c83f9af377a663a4c8e9ad025fd5c10496922.zip |
Use worker thread to send HTTP requests
Compute HTTP signature could be CPU intensive
-rw-r--r-- | server/helpers/requests.ts | 2 | ||||
-rw-r--r-- | server/initializers/constants.ts | 8 | ||||
-rw-r--r-- | server/lib/job-queue/handlers/activitypub-http-broadcast.ts | 54 | ||||
-rw-r--r-- | server/lib/job-queue/job-queue.ts | 6 | ||||
-rw-r--r-- | server/lib/worker/parent-process.ts | 37 | ||||
-rw-r--r-- | server/lib/worker/workers/http-broadcast.ts | 32 |
6 files changed, 110 insertions, 29 deletions
diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts index 0756beb16..1a3cc1b5b 100644 --- a/server/helpers/requests.ts +++ b/server/helpers/requests.ts | |||
@@ -192,6 +192,8 @@ async function findLatestRedirection (url: string, options: PeerTubeRequestOptio | |||
192 | // --------------------------------------------------------------------------- | 192 | // --------------------------------------------------------------------------- |
193 | 193 | ||
194 | export { | 194 | export { |
195 | PeerTubeRequestOptions, | ||
196 | |||
195 | doRequest, | 197 | doRequest, |
196 | doJSONRequest, | 198 | doJSONRequest, |
197 | doRequestAndSaveToFile, | 199 | doRequestAndSaveToFile, |
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index c2289ef36..f7d9a41da 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts | |||
@@ -786,6 +786,14 @@ const WORKER_THREADS = { | |||
786 | PROCESS_IMAGE: { | 786 | PROCESS_IMAGE: { |
787 | CONCURRENCY: 1, | 787 | CONCURRENCY: 1, |
788 | MAX_THREADS: 5 | 788 | MAX_THREADS: 5 |
789 | }, | ||
790 | SEQUENTIAL_HTTP_BROADCAST: { | ||
791 | CONCURRENCY: 1, | ||
792 | MAX_THREADS: 1 | ||
793 | }, | ||
794 | PARALLEL_HTTP_BROADCAST: { | ||
795 | CONCURRENCY: JOB_CONCURRENCY['activitypub-http-broadcast-parallel'], | ||
796 | MAX_THREADS: 1 | ||
789 | } | 797 | } |
790 | } | 798 | } |
791 | 799 | ||
diff --git a/server/lib/job-queue/handlers/activitypub-http-broadcast.ts b/server/lib/job-queue/handlers/activitypub-http-broadcast.ts index 13eff5211..733c1378a 100644 --- a/server/lib/job-queue/handlers/activitypub-http-broadcast.ts +++ b/server/lib/job-queue/handlers/activitypub-http-broadcast.ts | |||
@@ -1,39 +1,28 @@ | |||
1 | import { map } from 'bluebird' | ||
2 | import { Job } from 'bullmq' | 1 | import { Job } from 'bullmq' |
3 | import { buildGlobalHeaders, buildSignedRequestOptions, computeBody } from '@server/lib/activitypub/send' | 2 | import { buildGlobalHeaders, buildSignedRequestOptions, computeBody } from '@server/lib/activitypub/send' |
4 | import { ActorFollowHealthCache } from '@server/lib/actor-follow-health-cache' | 3 | import { ActorFollowHealthCache } from '@server/lib/actor-follow-health-cache' |
4 | import { sequentialHTTPBroadcastFromWorker } from '@server/lib/worker/parent-process' | ||
5 | import { ActivitypubHttpBroadcastPayload } from '@shared/models' | 5 | import { ActivitypubHttpBroadcastPayload } from '@shared/models' |
6 | import { logger } from '../../../helpers/logger' | 6 | import { logger } from '../../../helpers/logger' |
7 | import { doRequest } from '../../../helpers/requests' | ||
8 | import { BROADCAST_CONCURRENCY } from '../../../initializers/constants' | ||
9 | 7 | ||
10 | async function processActivityPubHttpBroadcast (job: Job) { | 8 | // Prefer using a worker thread for HTTP requests because on high load we may have to sign many requests, which can be CPU intensive |
9 | |||
10 | async function processActivityPubHttpSequentialBroadcast (job: Job<ActivitypubHttpBroadcastPayload>) { | ||
11 | logger.info('Processing ActivityPub broadcast in job %s.', job.id) | 11 | logger.info('Processing ActivityPub broadcast in job %s.', job.id) |
12 | 12 | ||
13 | const payload = job.data as ActivitypubHttpBroadcastPayload | 13 | const requestOptions = await buildRequestOptions(job.data) |
14 | 14 | ||
15 | const body = await computeBody(payload) | 15 | const { badUrls, goodUrls } = await sequentialHTTPBroadcastFromWorker({ uris: job.data.uris, requestOptions }) |
16 | const httpSignatureOptions = await buildSignedRequestOptions(payload) | ||
17 | 16 | ||
18 | const options = { | 17 | return ActorFollowHealthCache.Instance.updateActorFollowsHealth(goodUrls, badUrls) |
19 | method: 'POST' as 'POST', | 18 | } |
20 | json: body, | 19 | |
21 | httpSignature: httpSignatureOptions, | 20 | async function processActivityPubParallelHttpBroadcast (job: Job<ActivitypubHttpBroadcastPayload>) { |
22 | headers: buildGlobalHeaders(body) | 21 | logger.info('Processing ActivityPub parallel broadcast in job %s.', job.id) |
23 | } | ||
24 | 22 | ||
25 | const badUrls: string[] = [] | 23 | const requestOptions = await buildRequestOptions(job.data) |
26 | const goodUrls: string[] = [] | ||
27 | 24 | ||
28 | await map(payload.uris, async uri => { | 25 | const { badUrls, goodUrls } = await sequentialHTTPBroadcastFromWorker({ uris: job.data.uris, requestOptions }) |
29 | try { | ||
30 | await doRequest(uri, options) | ||
31 | goodUrls.push(uri) | ||
32 | } catch (err) { | ||
33 | logger.debug('HTTP broadcast to %s failed.', uri, { err }) | ||
34 | badUrls.push(uri) | ||
35 | } | ||
36 | }, { concurrency: BROADCAST_CONCURRENCY }) | ||
37 | 26 | ||
38 | return ActorFollowHealthCache.Instance.updateActorFollowsHealth(goodUrls, badUrls) | 27 | return ActorFollowHealthCache.Instance.updateActorFollowsHealth(goodUrls, badUrls) |
39 | } | 28 | } |
@@ -41,5 +30,20 @@ async function processActivityPubHttpBroadcast (job: Job) { | |||
41 | // --------------------------------------------------------------------------- | 30 | // --------------------------------------------------------------------------- |
42 | 31 | ||
43 | export { | 32 | export { |
44 | processActivityPubHttpBroadcast | 33 | processActivityPubHttpSequentialBroadcast, |
34 | processActivityPubParallelHttpBroadcast | ||
35 | } | ||
36 | |||
37 | // --------------------------------------------------------------------------- | ||
38 | |||
39 | async function buildRequestOptions (payload: ActivitypubHttpBroadcastPayload) { | ||
40 | const body = await computeBody(payload) | ||
41 | const httpSignatureOptions = await buildSignedRequestOptions(payload) | ||
42 | |||
43 | return { | ||
44 | method: 'POST' as 'POST', | ||
45 | json: body, | ||
46 | httpSignature: httpSignatureOptions, | ||
47 | headers: buildGlobalHeaders(body) | ||
48 | } | ||
45 | } | 49 | } |
diff --git a/server/lib/job-queue/job-queue.ts b/server/lib/job-queue/job-queue.ts index 0fcaaf466..e54d12acd 100644 --- a/server/lib/job-queue/job-queue.ts +++ b/server/lib/job-queue/job-queue.ts | |||
@@ -45,7 +45,7 @@ import { JOB_ATTEMPTS, JOB_COMPLETED_LIFETIME, JOB_CONCURRENCY, JOB_TTL, REPEAT_ | |||
45 | import { Hooks } from '../plugins/hooks' | 45 | import { Hooks } from '../plugins/hooks' |
46 | import { processActivityPubCleaner } from './handlers/activitypub-cleaner' | 46 | import { processActivityPubCleaner } from './handlers/activitypub-cleaner' |
47 | import { processActivityPubFollow } from './handlers/activitypub-follow' | 47 | import { processActivityPubFollow } from './handlers/activitypub-follow' |
48 | import { processActivityPubHttpBroadcast } from './handlers/activitypub-http-broadcast' | 48 | import { processActivityPubHttpSequentialBroadcast, processActivityPubParallelHttpBroadcast } from './handlers/activitypub-http-broadcast' |
49 | import { processActivityPubHttpFetcher } from './handlers/activitypub-http-fetcher' | 49 | import { processActivityPubHttpFetcher } from './handlers/activitypub-http-fetcher' |
50 | import { processActivityPubHttpUnicast } from './handlers/activitypub-http-unicast' | 50 | import { processActivityPubHttpUnicast } from './handlers/activitypub-http-unicast' |
51 | import { refreshAPObject } from './handlers/activitypub-refresher' | 51 | import { refreshAPObject } from './handlers/activitypub-refresher' |
@@ -96,8 +96,8 @@ export type CreateJobOptions = { | |||
96 | } | 96 | } |
97 | 97 | ||
98 | const handlers: { [id in JobType]: (job: Job) => Promise<any> } = { | 98 | const handlers: { [id in JobType]: (job: Job) => Promise<any> } = { |
99 | 'activitypub-http-broadcast': processActivityPubHttpBroadcast, | 99 | 'activitypub-http-broadcast': processActivityPubHttpSequentialBroadcast, |
100 | 'activitypub-http-broadcast-parallel': processActivityPubHttpBroadcast, | 100 | 'activitypub-http-broadcast-parallel': processActivityPubParallelHttpBroadcast, |
101 | 'activitypub-http-unicast': processActivityPubHttpUnicast, | 101 | 'activitypub-http-unicast': processActivityPubHttpUnicast, |
102 | 'activitypub-http-fetcher': processActivityPubHttpFetcher, | 102 | 'activitypub-http-fetcher': processActivityPubHttpFetcher, |
103 | 'activitypub-cleaner': processActivityPubCleaner, | 103 | 'activitypub-cleaner': processActivityPubCleaner, |
diff --git a/server/lib/worker/parent-process.ts b/server/lib/worker/parent-process.ts index 4bc7f2620..7d4102047 100644 --- a/server/lib/worker/parent-process.ts +++ b/server/lib/worker/parent-process.ts | |||
@@ -2,6 +2,7 @@ import { join } from 'path' | |||
2 | import Piscina from 'piscina' | 2 | import Piscina from 'piscina' |
3 | import { processImage } from '@server/helpers/image-utils' | 3 | import { processImage } from '@server/helpers/image-utils' |
4 | import { WORKER_THREADS } from '@server/initializers/constants' | 4 | import { WORKER_THREADS } from '@server/initializers/constants' |
5 | import { httpBroadcast } from './workers/http-broadcast' | ||
5 | import { downloadImage } from './workers/image-downloader' | 6 | import { downloadImage } from './workers/image-downloader' |
6 | 7 | ||
7 | let downloadImageWorker: Piscina | 8 | let downloadImageWorker: Piscina |
@@ -34,7 +35,41 @@ function processImageFromWorker (options: Parameters<typeof processImage>[0]): P | |||
34 | return processImageWorker.run(options) | 35 | return processImageWorker.run(options) |
35 | } | 36 | } |
36 | 37 | ||
38 | // --------------------------------------------------------------------------- | ||
39 | |||
40 | let parallelHTTPBroadcastWorker: Piscina | ||
41 | |||
42 | function parallelHTTPBroadcastFromWorker (options: Parameters<typeof httpBroadcast>[0]): Promise<ReturnType<typeof httpBroadcast>> { | ||
43 | if (!parallelHTTPBroadcastWorker) { | ||
44 | parallelHTTPBroadcastWorker = new Piscina({ | ||
45 | filename: join(__dirname, 'workers', 'http-broadcast.js'), | ||
46 | concurrentTasksPerWorker: WORKER_THREADS.PARALLEL_HTTP_BROADCAST.CONCURRENCY, | ||
47 | maxThreads: WORKER_THREADS.PARALLEL_HTTP_BROADCAST.MAX_THREADS | ||
48 | }) | ||
49 | } | ||
50 | |||
51 | return parallelHTTPBroadcastWorker.run(options) | ||
52 | } | ||
53 | |||
54 | // --------------------------------------------------------------------------- | ||
55 | |||
56 | let sequentialHTTPBroadcastWorker: Piscina | ||
57 | |||
58 | function sequentialHTTPBroadcastFromWorker (options: Parameters<typeof httpBroadcast>[0]): Promise<ReturnType<typeof httpBroadcast>> { | ||
59 | if (!sequentialHTTPBroadcastWorker) { | ||
60 | sequentialHTTPBroadcastWorker = new Piscina({ | ||
61 | filename: join(__dirname, 'workers', 'http-broadcast.js'), | ||
62 | concurrentTasksPerWorker: WORKER_THREADS.SEQUENTIAL_HTTP_BROADCAST.CONCURRENCY, | ||
63 | maxThreads: WORKER_THREADS.SEQUENTIAL_HTTP_BROADCAST.MAX_THREADS | ||
64 | }) | ||
65 | } | ||
66 | |||
67 | return sequentialHTTPBroadcastWorker.run(options) | ||
68 | } | ||
69 | |||
37 | export { | 70 | export { |
38 | downloadImageFromWorker, | 71 | downloadImageFromWorker, |
39 | processImageFromWorker | 72 | processImageFromWorker, |
73 | parallelHTTPBroadcastFromWorker, | ||
74 | sequentialHTTPBroadcastFromWorker | ||
40 | } | 75 | } |
diff --git a/server/lib/worker/workers/http-broadcast.ts b/server/lib/worker/workers/http-broadcast.ts new file mode 100644 index 000000000..8c9c6b8ca --- /dev/null +++ b/server/lib/worker/workers/http-broadcast.ts | |||
@@ -0,0 +1,32 @@ | |||
1 | import { map } from 'bluebird' | ||
2 | import { logger } from '@server/helpers/logger' | ||
3 | import { doRequest, PeerTubeRequestOptions } from '@server/helpers/requests' | ||
4 | import { BROADCAST_CONCURRENCY } from '@server/initializers/constants' | ||
5 | |||
6 | async function httpBroadcast (payload: { | ||
7 | uris: string[] | ||
8 | requestOptions: PeerTubeRequestOptions | ||
9 | }) { | ||
10 | const { uris, requestOptions } = payload | ||
11 | |||
12 | const badUrls: string[] = [] | ||
13 | const goodUrls: string[] = [] | ||
14 | |||
15 | await map(uris, async uri => { | ||
16 | try { | ||
17 | await doRequest(uri, requestOptions) | ||
18 | goodUrls.push(uri) | ||
19 | } catch (err) { | ||
20 | logger.debug('HTTP broadcast to %s failed.', uri, { err }) | ||
21 | badUrls.push(uri) | ||
22 | } | ||
23 | }, { concurrency: BROADCAST_CONCURRENCY }) | ||
24 | |||
25 | return { goodUrls, badUrls } | ||
26 | } | ||
27 | |||
28 | module.exports = httpBroadcast | ||
29 | |||
30 | export { | ||
31 | httpBroadcast | ||
32 | } | ||