github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-06-27 10:40:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

[LockManager] Update token and metadata when an expired lock is re-acquired (#220476)

Browse source 
Related: https://github.com/elastic/kibana/pull/216397

This fixes a bug in the Lock Manager where an expired lock can be
acquired, but the token and metadata is not updated. This means that the
lock cannot be released. Instead it is automatically released when the
TTL expires.
This commit is contained in:
Søren Louv-Jansen 2025-05-08 19:40:20 +02:00 • committed by GitHub
parent 9fc42af400
commit 74e876d12d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 38 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
packages/kbn-lock-manager/src/lock_manager_client.ts
View file

@ -87,6 +87,8 @@ export class LockManager {
def instantNow = Instant.ofEpochMilli(now);
ctx._source.createdAt = instantNow.toString();
ctx._source.expiresAt = instantNow.plusMillis(params.ttl).toString();
ctx._source.metadata = params.metadata;
ctx._source.token = params.token;
} else {
ctx.op = 'noop';
}
@ -94,13 +96,11 @@ export class LockManager {
params: {
ttl,
token: this.token,
metadata,
},
},
// @ts-expect-error
upsert: {
metadata,
token: this.token,
},
upsert: {},
},
{
retryOnTimeout: true,
@ -189,7 +189,7 @@ export class LockManager {
this.logger.debug(`Lock "${this.lockId}" released with token ${this.token}.`);
return true;
case 'noop':
this.logger.debug(
this.logger.warn(
`Lock "${this.lockId}" with token = ${this.token} could not be released. Token does not match.`
);
return false;