yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix race in grid server (#9999)

Browse Source
This commit is contained in:
Andrey Lushnikov 2021-11-02 18:01:15 -07:00 committed by GitHub
parent 5abb5d74ea
commit 2e1dcaf2ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/playwright-core/src/grid/gridServer.ts
View File

@ -101,7 +101,7 @@ class GridAgent extends EventEmitter {
private _ws: WebSocket | undefined; private _ws: WebSocket | undefined;
readonly _workers = new Map<string, GridWorker>(); readonly _workers = new Map<string, GridWorker>();
private _status: AgentStatus = 'none'; private _status: AgentStatus = 'none';
private _workersWaitingForAgentConnected: GridWorker[] = []; private _workersWaitingForAgentConnected: Set<GridWorker> = new Set();
private _retireTimeout = 30000; private _retireTimeout = 30000;
private _retireTimeoutId: NodeJS.Timeout | undefined; private _retireTimeoutId: NodeJS.Timeout | undefined;
private _log: debug.Debugger; private _log: debug.Debugger;
@ -135,7 +135,7 @@ class GridAgent extends EventEmitter {
this._log(`send worker id: ${worker.workerId}`); this._log(`send worker id: ${worker.workerId}`);
ws.send(worker.workerId); ws.send(worker.workerId);
} }
this._workersWaitingForAgentConnected = []; this._workersWaitingForAgentConnected.clear();
} }
canCreateWorker() { canCreateWorker() {
@ -152,6 +152,7 @@ class GridAgent extends EventEmitter {
this._workers.set(worker.workerId, worker); this._workers.set(worker.workerId, worker);
worker.on('close', () => { worker.on('close', () => {
this._workers.delete(worker.workerId); this._workers.delete(worker.workerId);
this._workersWaitingForAgentConnected.delete(worker);
if (!this._workers.size) { if (!this._workers.size) {
this.setStatus('retiring'); this.setStatus('retiring');
if (this._retireTimeoutId) if (this._retireTimeoutId)
@ -164,7 +165,7 @@ class GridAgent extends EventEmitter {
this._log(`send worker id: ${worker.workerId}`); this._log(`send worker id: ${worker.workerId}`);
this._ws.send(worker.workerId); this._ws.send(worker.workerId);
} else { } else {
this._workersWaitingForAgentConnected.push(worker); this._workersWaitingForAgentConnected.add(worker);
} }
} }