mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(dal,snapshotsWorker): Исправлен захват роботом задачи, добавлено увеличение попыток. Исправлен dockerfile для снапшотов.

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-07-13 16:16:37 +10:00
parent 511721b798
commit b1c3d90b40
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PARR.DAL/Repositories/RobotConfigurationRepository.cs
View File

@@ -116,12 +116,12 @@ namespace PARR.DAL.Repositories
var endDate = DateTimeOffset.UtcNow.Add(-settingsFromDb.RobotWaitTime); var endDate = DateTimeOffset.UtcNow.Add(-settingsFromDb.RobotWaitTime);
// Выполняем атомарный UPDATE напрямую в базе данных // Выполняем атомарный UPDATE напрямую в базе данных
var affectedRows = await EntitySet.Where(t => t.Id == id var affectedRows = await EntitySet.Where(t => t.Id == id
&& ( && (
// Задания в статусе ожидание // Задания в статусе ожидание
t.RobotStatusCode == (int)RobotStatusEnum.Wait t.RobotStatusCode == (int)RobotStatusEnum.Wait
|| ( || (
// Задание в статусе в работе, но они зависли // Задание в статусе в работе, но они зависли
t.RobotStatusCode == (int)RobotStatusEnum.InProgress t.RobotStatusCode == (int)RobotStatusEnum.InProgress
&& t.AttemptsNumber < settingsFromDb.RobotAttemptsNumber && t.AttemptsNumber < settingsFromDb.RobotAttemptsNumber
&& t.LastRobotStatusUpdated < endDate && t.LastRobotStatusUpdated < endDate
@@ -131,6 +131,7 @@ namespace PARR.DAL.Repositories
.ExecuteUpdateAsync(s => s .ExecuteUpdateAsync(s => s
.SetProperty(t => t.RobotStatusCode, (int)RobotStatusEnum.InProgress) .SetProperty(t => t.RobotStatusCode, (int)RobotStatusEnum.InProgress)
.SetProperty(t => t.LastRobotStatusUpdated, DateTimeOffset.UtcNow) .SetProperty(t => t.LastRobotStatusUpdated, DateTimeOffset.UtcNow)
.SetProperty(t => t.AttemptsNumber, t => t.AttemptsNumber + 1)
); );
return affectedRows > 0; return affectedRows > 0;

2
PARR.SnapshotWorker/Dockerfile
View File

@@ -2,13 +2,13 @@
# This stage is used when running from VS in fast mode (Default for Debug configuration) # This stage is used when running from VS in fast mode (Default for Debug configuration)
FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base FROM 10.99.253.167:8090/dotnet/runtime:9.0 AS base
#USER $APP_UID
WORKDIR /app WORKDIR /app
# This stage is used to build the service project # This stage is used to build the service project
FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build FROM 10.99.253.167:8090/dotnet/sdk:9.0 AS build
ARG BUILD_CONFIGURATION=Release ARG BUILD_CONFIGURATION=Release
USER root
WORKDIR /src WORKDIR /src
COPY ["NuGet.config", "."] COPY ["NuGet.config", "."]
COPY ["PARR.SnapshotWorker/PARR.SnapshotWorker.csproj", "PARR.SnapshotWorker/"] COPY ["PARR.SnapshotWorker/PARR.SnapshotWorker.csproj", "PARR.SnapshotWorker/"]