Fixes missed _periodSec variable (#4666)

This commit is contained in:
Brendan Kowitz 2024-10-09 11:02:29 -07:00 коммит произвёл GitHub
Родитель 07290d6120
Коммит e9a016285f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
2 изменённых файлов: 10 добавлений и 12 удалений

Просмотреть файл

@ -21,8 +21,6 @@ namespace Microsoft.Health.Fhir.SqlServer.Features.Watchdogs
private readonly ISqlRetryService _sqlRetryService;
private readonly ILogger<T> _logger;
private readonly WatchdogLease<T> _watchdogLease;
private double _periodSec;
private double _leasePeriodSec;
private readonly FhirTimer _fhirTimer;
protected Watchdog(ISqlRetryService sqlRetryService, ILogger<T> logger)
@ -60,11 +58,11 @@ namespace Microsoft.Health.Fhir.SqlServer.Features.Watchdogs
{
_logger.LogInformation($"{Name}.ExecuteAsync: starting...");
await InitParamsAsync(PeriodSec, LeasePeriodSec);
await InitParamsAsync();
await Task.WhenAll(
_fhirTimer.ExecuteAsync(_periodSec, OnNextTickAsync, cancellationToken),
_watchdogLease.ExecuteAsync(AllowRebalance, _leasePeriodSec, cancellationToken));
_fhirTimer.ExecuteAsync(PeriodSec, OnNextTickAsync, cancellationToken),
_watchdogLease.ExecuteAsync(AllowRebalance, LeasePeriodSec, cancellationToken));
_logger.LogInformation($"{Name}.ExecuteAsync: completed.");
}
@ -85,7 +83,7 @@ namespace Microsoft.Health.Fhir.SqlServer.Features.Watchdogs
}
}
private async Task InitParamsAsync(double periodSec, double leasePeriodSec) // No CancellationToken is passed since we shouldn't cancel initialization.
private async Task InitParamsAsync() // No CancellationToken is passed since we shouldn't cancel initialization.
{
using (_logger.BeginTimedScope($"{Name}.InitParamsAsync"))
{
@ -98,13 +96,13 @@ INSERT INTO dbo.Parameters (Id,Number) SELECT @PeriodSecId, @PeriodSec
INSERT INTO dbo.Parameters (Id,Number) SELECT @LeasePeriodSecId, @LeasePeriodSec
");
cmd.Parameters.AddWithValue("@PeriodSecId", PeriodSecId);
cmd.Parameters.AddWithValue("@PeriodSec", periodSec);
cmd.Parameters.AddWithValue("@PeriodSec", PeriodSec);
cmd.Parameters.AddWithValue("@LeasePeriodSecId", LeasePeriodSecId);
cmd.Parameters.AddWithValue("@LeasePeriodSec", leasePeriodSec);
cmd.Parameters.AddWithValue("@LeasePeriodSec", LeasePeriodSec);
await cmd.ExecuteNonQueryAsync(_sqlRetryService, _logger, CancellationToken.None);
_periodSec = await GetPeriodAsync(CancellationToken.None);
_leasePeriodSec = await GetLeasePeriodAsync(CancellationToken.None);
PeriodSec = await GetPeriodAsync(CancellationToken.None);
LeasePeriodSec = await GetLeasePeriodAsync(CancellationToken.None);
await InitAdditionalParamsAsync();

Просмотреть файл

@ -214,7 +214,7 @@ END
Task wdTask = wd.ExecuteAsync(cts.Token);
DateTime startTime = DateTime.UtcNow;
while (!wd.IsLeaseHolder && (DateTime.UtcNow - startTime).TotalSeconds < 10)
while (!wd.IsLeaseHolder && (DateTime.UtcNow - startTime).TotalSeconds < 20)
{
await Task.Delay(TimeSpan.FromSeconds(0.2), cts.Token);
}
@ -251,7 +251,7 @@ END
Task wdTask = wd.ExecuteAsync(cts.Token);
var startTime = DateTime.UtcNow;
while (!wd.IsLeaseHolder && (DateTime.UtcNow - startTime).TotalSeconds < 10)
while (!wd.IsLeaseHolder && (DateTime.UtcNow - startTime).TotalSeconds < 20)
{
await Task.Delay(TimeSpan.FromSeconds(0.2), cts.Token);
}