mirror of
https://github.com/gristlabs/grist-core.git
synced 2024-09-28 21:40:46 +00:00
2705d41c34
Summary: Add two shutdown-related timeouts. 1. One is to limit the duration of any work that happens once shutdown begins. In particular, waiting for an update to current time could block indefinitely if the data engine is unresponsive. Such awaits are now limited to 5 seconds. 2. The other is to allow documents to get shutdown for inactivity even when some work takes forever. Certain work (e.g. applying user actions) generally prevents a document from shutting down while it's pending. This prevention is now limited to 5 minutes. Shutting down a doc while something is pending may break some assumptions, and lead to errors. The timeout is long to let us assume that the work is stuck, and that errors are better than waiting forever. Other changes: - Periodic ActiveDoc work (intervals) is now started when a doc finishes loading rather than in the constructor. The difference only showed up in tests which makes the intervals much shorter. - Move timeoutReached() utility function to gutil, and use it for isLongerThan(), since they are basically identical. Also makes sure that the timer in these is cleared in all cases. - Remove duplicate waitForIt implementation (previously had a copy in both test/server and core/test/server). - Change testUtil.captureLog to pass messages to its callback, to allow asserts on messages within the callback. Test Plan: Added new unittests for the new shutdowns, including a replication of a bad state that was possible during shutdown. Reviewers: paulfitz Reviewed By: paulfitz Subscribers: paulfitz Differential Revision: https://phab.getgrist.com/D4040
19 lines
471 B
TypeScript
19 lines
471 B
TypeScript
import * as bluebird from 'bluebird';
|
|
|
|
/**
|
|
* Wait some time for a check to pass. Allow a pause between checks.
|
|
*/
|
|
export async function waitForIt(check: () => Promise<void>|void, maxWaitMs: number,
|
|
stepWaitMs: number = 1000) {
|
|
const start = Date.now();
|
|
for (;;) {
|
|
try {
|
|
await check();
|
|
return;
|
|
} catch (e) {
|
|
if (Date.now() - start > maxWaitMs) { throw e; }
|
|
}
|
|
await bluebird.delay(stepWaitMs);
|
|
}
|
|
}
|