Skip to content

A modern, self-hosted backup solution for secure, encrypted backups across local and cloud storage.

fix: show missing concurrency limit message on backup now trigger

towfiqi5ecbab147918
diff --git a/backend/src/jobs/JobProcessor.ts b/backend/src/jobs/JobProcessor.ts
index 436b854..aa68cd4 100644
--- a/backend/src/jobs/JobProcessor.ts
+++ b/backend/src/jobs/JobProcessor.ts
@@ -89,6 +89,13 @@ class JobProcessor extends EventEmitter {
this.tasks.set(task.name, task);
}
+ /**
+ * Returns the number of currently running backup jobs.
+ */
+ public getActiveBackupJobs(): number {
+ return this.activeBackupJobs;
+ }
+
/**
* Starts the JobProcessor and checks for jobs every `interval` milliseconds.
* @param interval - Optional interval in milliseconds. Default is 5000ms.
diff --git a/backend/src/managers/BaseBackupManager.ts b/backend/src/managers/BaseBackupManager.ts
index a040d21..d83760c 100644
--- a/backend/src/managers/BaseBackupManager.ts
+++ b/backend/src/managers/BaseBackupManager.ts
@@ -7,6 +7,7 @@ import { BackupPlanArgs, PlanPrune } from '../types/plans';
import { BackupHandler } from './handlers/BackupHandler';
import { PruneHandler } from './handlers/PruneHandler';
import { jobQueue } from '../jobs/JobQueue';
+import { jobProcessor } from '../jobs/JobProcessor';
import { generateUID } from '../utils/helpers';
import { configService } from '../services/ConfigService';
@@ -186,7 +187,14 @@ export class BaseBackupManager extends EventEmitter {
return { success: false, result: 'No backup schedule found for this plan.' };
}
jobQueue.addPriorityJob('Backup', { planId, backupId }, retries, retryDelay * 1000);
- return { success: true, result: 'Backup job has been added to the queue.' };
+ const activeBackupJobs = jobProcessor.getActiveBackupJobs();
+ const maxConcurrentBackups = configService.config.MAX_CONCURRENT_BACKUPS;
+ const reachedLimit = activeBackupJobs >= maxConcurrentBackups;
+ const resultMessage = reachedLimit
+ ? `Backup Queue has reached the concurrency limit of ${maxConcurrentBackups}. Your backup will start shortly.`
+ : 'Backup job has been added to the queue and will start shortly.';
+
+ return { success: true, result: resultMessage };
}
/**
diff --git a/frontend/src/hooks/usePlanSingleActions.tsx b/frontend/src/hooks/usePlanSingleActions.tsx
index 41b49b5..558ffe9 100644
--- a/frontend/src/hooks/usePlanSingleActions.tsx
+++ b/frontend/src/hooks/usePlanSingleActions.tsx
@@ -99,13 +99,15 @@ export const usePlanSingleActions = (): {
performBackupMutation.mutate(plan.id, {
onSuccess: (data) => {
+ const msg = data?.message || `${isSync ? 'Sync' : 'Backup'} initiated successfully! πŸš€`;
+ const notStarted = !isSync && data?.message && data?.message.includes('reached the concurrency limit');
toast.update(toastId, {
- render: isSync ? data?.message || 'Sync initiated successfully! πŸš€' : 'Backup initiated successfully! πŸš€',
+ render: isSync ? msg : notStarted ? data?.message : 'Backup initiated successfully!',
type: 'success',
isLoading: false,
autoClose: 3000,
});
- if (!isSync) {
+ if (!isSync && !notStarted) {
navigate(`/plan/${plan.id}?pendingbackup=1`);
}
},