Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -285,20 +285,26 @@ export async function withLock<T>(
`Lock "${lockId}" acquired. Extending TTL every ${prettyMilliseconds(extendInterval)}`
);

let extendTTlPromise = Promise.resolve(true);
const intervalId = setInterval(() => {
lockManager.extendTtl().catch((err) => {
logger.error(`Failed to extend lock "${lockId}":`, err);
});
// wait for the previous extendTtl request to finish before sending the next one. This is to avoid flooding ES with extendTtl requests in cases where ES is slow to respond.
extendTTlPromise = extendTTlPromise
.then(() => lockManager.extendTtl())
.catch((err) => {
logger.error(`Failed to extend lock "${lockId}":`, err);
return false;
});
}, extendInterval);

try {
return await callback();
} finally {
clearInterval(intervalId);
try {
clearInterval(intervalId);
await extendTTlPromise;
await lockManager.release();
} catch (error) {
logger.error(`Failed to release lock "${lockId}": ${error.message}`);
logger.error(`Failed to release lock "${lockId}" in withLock: ${error.message}`);
}
}
}
Expand Down