Fix queue management in jest-worker #7934
Conversation
packages/jest-worker/src/Farm.ts
Outdated
|
|
||
| return this; | ||
| } | ||
|
|
||
| private _enqueue(task: QueueChildMessage, workerId: number): Farm { | ||
| const item = {task, next: null}; |
There was a problem hiding this comment.
The core of the fix is only this line; where instead of pushing to all queues the task object, we create one specifically for each queue, (meaning that when doing .next in the tail of a linked list, we don't affect all others).
The rest of the PR are "cosmetic" changes, and the test.
| this._offset++; | ||
|
|
||
| return this; | ||
| } | ||
|
|
||
| lock(workerId: number): void { | ||
| private _lock(workerId: number): void { |
There was a problem hiding this comment.
technically breaking, but I guess these shouldn't be called anyways by consumers?
There was a problem hiding this comment.
Yeah, playing with worker locks is a recipe for disaster :D
| @@ -14,7 +14,8 @@ | |||
| - `[jest-changed-files]` Improve default file selection for Mercurial repos ([#7880](https://github.com/facebook/jest/pull/7880)) | |||
| - `[jest-validate]` Fix validating async functions ([#7894](https://github.com/facebook/jest/issues/7894)) | |||
| - `[jest-circus]` Fix bug with test.only ([#7888](https://github.com/facebook/jest/pull/7888)) | |||
| - `[jest-transform]` Normalize config and remove unecessary checks, convert `TestUtils.js` to TypeScript ([#7801](https://github.com/facebook/jest/pull/7801) | |||
| - `[jest-transform]` Normalize config and remove unecessary checks, convert `TestUtils.js` to TypeScript ([#7801](https://github.com/facebook/jest/pull/7801)) | |||
There was a problem hiding this comment.
took me forever to spot the fixed missing paren :P
| private _locks: Array<boolean>; | ||
| private _numOfWorkers: number; | ||
| private _offset: number; | ||
| private _queue: Array<QueueChildMessage | null>; | ||
| private _queue: Array<QueueItem | null>; |
There was a problem hiding this comment.
| private _queue: Array<QueueItem | null>; | |
| private _queue: Array<QueueItem>; |
right? there can never be nulls in the queue now?
There was a problem hiding this comment.
The queue can be empty, and that's signaled by a null item.
There was a problem hiding this comment.
so Array<QueueItem> | [null]? I guess it doesn't matter in practice
There was a problem hiding this comment.
The array index refers to each of the workers (I.e. this._queue.length is numOfWorkers, not the list of jobs); so each item in the array is either the first element of the linked list, or null.
|
This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Nodes in a linked list were shared among all lists for each worker; which is not what we would like to do. The expected part to be shared is only the request object (which uses the first position as a lock between jobs); but the wrapper object for the linked list needs to be unique.
I also added a test that would crash without the fix.