diff options
author | Chocobozzz <me@florianbigard.com> | 2022-11-16 14:40:10 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-11-16 14:40:10 +0100 |
commit | f240fb4bea61484854cecbe711ac20d77c31915d (patch) | |
tree | a717b4d49191b78848c2570f4c5f230df8a7ae41 /server/lib/worker/parent-process.ts | |
parent | 2198bb5a1981177b04dd94b2b1b6a90c5d7a5c25 (diff) | |
download | PeerTube-f240fb4bea61484854cecbe711ac20d77c31915d.tar.gz PeerTube-f240fb4bea61484854cecbe711ac20d77c31915d.tar.zst PeerTube-f240fb4bea61484854cecbe711ac20d77c31915d.zip |
Fix broadcasting in parallel views
Diffstat (limited to 'server/lib/worker/parent-process.ts')
-rw-r--r-- | server/lib/worker/parent-process.ts | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/server/lib/worker/parent-process.ts b/server/lib/worker/parent-process.ts index 7d4102047..48b6c682b 100644 --- a/server/lib/worker/parent-process.ts +++ b/server/lib/worker/parent-process.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { join } from 'path' | 1 | 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 { JOB_CONCURRENCY, WORKER_THREADS } from '@server/initializers/constants' |
5 | import { httpBroadcast } from './workers/http-broadcast' | 5 | import { httpBroadcast } from './workers/http-broadcast' |
6 | import { downloadImage } from './workers/image-downloader' | 6 | import { downloadImage } from './workers/image-downloader' |
7 | 7 | ||
@@ -43,8 +43,9 @@ function parallelHTTPBroadcastFromWorker (options: Parameters<typeof httpBroadca | |||
43 | if (!parallelHTTPBroadcastWorker) { | 43 | if (!parallelHTTPBroadcastWorker) { |
44 | parallelHTTPBroadcastWorker = new Piscina({ | 44 | parallelHTTPBroadcastWorker = new Piscina({ |
45 | filename: join(__dirname, 'workers', 'http-broadcast.js'), | 45 | filename: join(__dirname, 'workers', 'http-broadcast.js'), |
46 | concurrentTasksPerWorker: WORKER_THREADS.PARALLEL_HTTP_BROADCAST.CONCURRENCY, | 46 | // Keep it sync with job concurrency so the worker will accept all the requests sent by the parallelized jobs |
47 | maxThreads: WORKER_THREADS.PARALLEL_HTTP_BROADCAST.MAX_THREADS | 47 | concurrentTasksPerWorker: JOB_CONCURRENCY['activitypub-http-broadcast-parallel'], |
48 | maxThreads: 1 | ||
48 | }) | 49 | }) |
49 | } | 50 | } |
50 | 51 | ||
@@ -59,8 +60,9 @@ function sequentialHTTPBroadcastFromWorker (options: Parameters<typeof httpBroad | |||
59 | if (!sequentialHTTPBroadcastWorker) { | 60 | if (!sequentialHTTPBroadcastWorker) { |
60 | sequentialHTTPBroadcastWorker = new Piscina({ | 61 | sequentialHTTPBroadcastWorker = new Piscina({ |
61 | filename: join(__dirname, 'workers', 'http-broadcast.js'), | 62 | filename: join(__dirname, 'workers', 'http-broadcast.js'), |
62 | concurrentTasksPerWorker: WORKER_THREADS.SEQUENTIAL_HTTP_BROADCAST.CONCURRENCY, | 63 | // Keep it sync with job concurrency so the worker will accept all the requests sent by the parallelized jobs |
63 | maxThreads: WORKER_THREADS.SEQUENTIAL_HTTP_BROADCAST.MAX_THREADS | 64 | concurrentTasksPerWorker: JOB_CONCURRENCY['activitypub-http-broadcast'], |
65 | maxThreads: 1 | ||
64 | }) | 66 | }) |
65 | } | 67 | } |
66 | 68 | ||