perf(ngcc): allow immediately reporting a stale lock file (#37250)
Currently, if an ngcc process is killed in a manner that it doesn't clean up its lock file (or is killed too quickly) the compiler reports that it is waiting on the PID of a process that doesn't exist, and that it will wait up to a maximum of N seconds. This PR updates the locking code to additionally check if the process exists, and if it does not it will immediately bail out, and print the location of the lock file so a user may clean it up. PR Close #37250
This commit is contained in:

committed by
Matias Niemelä

parent
4414be77c4
commit
561c0f81a0
@ -71,6 +71,7 @@ runInEachFileSystem(() => {
|
||||
}
|
||||
return lockFileContents;
|
||||
});
|
||||
spyOn(process, 'kill').and.returnValue();
|
||||
|
||||
const promise = locker.lock(async () => log.push('fn()'));
|
||||
// The lock is now waiting on the lock-file becoming free, so no `fn()` in the log.
|
||||
@ -80,6 +81,7 @@ runInEachFileSystem(() => {
|
||||
`(If you are sure no ngcc process is running then you should delete the lock-file at ${
|
||||
lockFile.path}.)`
|
||||
]]);
|
||||
expect(process.kill).toHaveBeenCalledWith(188, 0);
|
||||
|
||||
lockFileContents = null;
|
||||
// The lock-file has been removed, so we can create our own lock-file, call `fn()` and then
|
||||
@ -88,6 +90,47 @@ runInEachFileSystem(() => {
|
||||
expect(log).toEqual(['write()', 'read() => 188', 'write()', 'fn()', 'remove()']);
|
||||
});
|
||||
|
||||
it('should fail fast when waiting on a dead process', async () => {
|
||||
const fs = getFileSystem();
|
||||
const log: string[] = [];
|
||||
const lockFile = new MockLockFile(fs, log);
|
||||
const logger = new MockLogger();
|
||||
const locker = new AsyncLocker(lockFile, logger, 100, 10);
|
||||
|
||||
let lockFileContents: string|null = '188';
|
||||
spyOn(lockFile, 'write').and.callFake(() => {
|
||||
log.push('write()');
|
||||
if (lockFileContents) {
|
||||
throw {code: 'EEXIST'};
|
||||
}
|
||||
});
|
||||
spyOn(lockFile, 'read').and.callFake(() => {
|
||||
log.push('read() => ' + lockFileContents);
|
||||
if (lockFileContents === null) {
|
||||
throw {code: 'ENOENT'};
|
||||
}
|
||||
return lockFileContents;
|
||||
});
|
||||
spyOn(process, 'kill').and.callFake(() => {
|
||||
throw {code: 'ESRCH'};
|
||||
});
|
||||
|
||||
const promise = locker.lock(async () => log.push('fn()'));
|
||||
// The lock has already failed so no `fn()` in the log.
|
||||
expect(log).toEqual(['write()', 'read() => 188', 'write()', 'read() => 188']);
|
||||
expect(logger.logs.info).toEqual([]);
|
||||
expect(process.kill).toHaveBeenCalledWith(188, 0);
|
||||
// Check that a missing process errors out.
|
||||
let error: Error;
|
||||
await promise.catch(e => error = e);
|
||||
expect(log).toEqual(['write()', 'read() => 188', 'write()', 'read() => 188']);
|
||||
expect(error!.message)
|
||||
.toEqual(
|
||||
`Lock found, but no process with PID 188 seems to be running.\n` +
|
||||
`(If you are sure no ngcc process is running then you should delete the lock-file at ${
|
||||
lockFile.path}.)`);
|
||||
});
|
||||
|
||||
it('should extend the retry timeout if the other process locking the file changes', async () => {
|
||||
const fs = getFileSystem();
|
||||
const log: string[] = [];
|
||||
@ -109,6 +152,7 @@ runInEachFileSystem(() => {
|
||||
}
|
||||
return lockFileContents;
|
||||
});
|
||||
spyOn(process, 'kill').and.returnValue();
|
||||
|
||||
const promise = locker.lock(async () => log.push('fn()'));
|
||||
// The lock is now waiting on the lock-file becoming free, so no `fn()` in the log.
|
||||
@ -118,6 +162,7 @@ runInEachFileSystem(() => {
|
||||
`(If you are sure no ngcc process is running then you should delete the lock-file at ${
|
||||
lockFile.path}.)`
|
||||
]]);
|
||||
expect(process.kill).toHaveBeenCalledWith(188, 0);
|
||||
|
||||
lockFileContents = '444';
|
||||
// The lock-file has been taken over by another process - wait for the next attempt
|
||||
@ -131,6 +176,7 @@ runInEachFileSystem(() => {
|
||||
`(If you are sure no ngcc process is running then you should delete the lock-file at ${
|
||||
lockFile.path}.)`]
|
||||
]);
|
||||
expect(process.kill).toHaveBeenCalledWith(444, 0);
|
||||
|
||||
lockFileContents = null;
|
||||
// The lock-file has been removed, so we can create our own lock-file, call `fn()` and
|
||||
@ -163,11 +209,13 @@ runInEachFileSystem(() => {
|
||||
}
|
||||
return lockFileContents;
|
||||
});
|
||||
spyOn(process, 'kill').and.returnValue();
|
||||
|
||||
const promise = locker.lock(async () => log.push('fn()'));
|
||||
|
||||
// The lock is now waiting on the lock-file becoming free, so no `fn()` in the log.
|
||||
expect(log).toEqual(['write()', 'read() => 188']);
|
||||
expect(process.kill).toHaveBeenCalledWith(188, 0);
|
||||
// Do not remove the lock-file and let the call to `lock()` timeout.
|
||||
let error: Error;
|
||||
await promise.catch(e => error = e);
|
||||
|
Reference in New Issue
Block a user