IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backup: refactoring

Browse Source
This commit is contained in:
Alexey Bannov 2022-04-01 17:37:21 +03:00
parent d0c36facbb
commit abce571695
3 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
common/ASC.Data.Backup.Core/Service/BackupWorker.cs
View File

@ -259,46 +259,15 @@ public class BackupWorker
return progress;
}
public bool HaveBackupRestoreRequestWaitingTasks()
public bool IsInstanceTooBusy()
{
var countActiveTask = _progressQueue.GetAllTasks<RestoreProgressItem>().Where(x => !x.IsCompleted).Count();
var instanceTasks = _progressQueue.GetAllTasks(DistributedTaskQueue.INSTANCE_ID);
if (_progressQueue.MaxThreadsCount >= countActiveTask)
if (_progressQueue.MaxThreadsCount >= instanceTasks.Count())
{
return false;
}
return true;
}
public bool HaveBackupTransferRequestWaitingTasks()
{
if (_progressQueue.MaxThreadsCount == -1) return false;
var countActiveTask = _progressQueue.GetAllTasks<TransferProgressItem>().Where(x => !x.IsCompleted).Count();
if (_progressQueue.MaxThreadsCount >= countActiveTask)
{
return false;
}
return true;
}
public bool HaveBackupRequestWaitingTasks()
{
if (_progressQueue.MaxThreadsCount == -1) return false;
var countActiveTask = _progressQueue.GetAllTasks<BackupProgressItem>().Where(x => !x.IsCompleted).Count();
if (_progressQueue.MaxThreadsCount >= countActiveTask)
{
return false;
}
return true;
}
}

2
common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupRequestIntegrationEventHandler.cs
View File

@ -34,7 +34,7 @@ public class BackupRequestIntegrationEventHandler : IIntegrationEventHandler<Bac
if (!@event.Redelivered)
{
if (_backupWorker.HaveBackupRequestWaitingTasks())
if (_backupWorker.IsInstanceTooBusy())
{
throw new IntegrationEventRejectExeption(@event.Id);
}

2
common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupRestoreRequestIntegrationEventHandler.cs
View File

@ -34,7 +34,7 @@ public class BackupRestoreRequestIntegrationEventHandler : IIntegrationEventHand
if (!@event.Redelivered)
{
if (_backupWorker.HaveBackupRestoreRequestWaitingTasks())
if (_backupWorker.IsInstanceTooBusy())
{
throw new IntegrationEventRejectExeption(@event.Id);
}