lee/backrest
1
0
Fork 0
mirror of https://github.com/garethgeorge/backrest.git synced 2025-12-12 16:55:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: task priority not taking effect

Browse Source
This commit is contained in:
garethgeorge
2023-12-01 22:55:26 -08:00
parent f3dc7ffd07
commit af7462cefb
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/orchestrator/orchestrator.go
View File

@@ -20,10 +20,10 @@ var ErrRepoInitializationFailed = errors.New("repo initialization failed")
var ErrPlanNotFound = errors.New("plan not found") var ErrPlanNotFound = errors.New("plan not found")
const ( const (
TaskPriorityDefault = iota TaskPriorityDefault = iota
TaskPriorityInteractive // higher priority than default scheduled operations e.g. the user clicked to run an operation. TaskPriorityInteractive // higher priority than default scheduled operations e.g. the user clicked to run an operation
taskPriorityForget
taskPriorityIndexSnapshots // higher priority than interactive operations e.g. a system operation like a forget or index (typically scheduled by another task that wants work done immediately after it's completion). taskPriorityIndexSnapshots // higher priority than interactive operations e.g. a system operation like a forget or index (typically scheduled by another task that wants work done immediately after it's completion).
taskPriorityForget
) )
// Orchestrator is responsible for managing repos and backups. // Orchestrator is responsible for managing repos and backups.
@@ -163,8 +163,9 @@ func (o *Orchestrator) ScheduleTask(t Task, priority int) {
} }
zap.L().Info("scheduling task", zap.String("task", t.Name()), zap.String("runAt", nextRun.Format(time.RFC3339))) zap.L().Info("scheduling task", zap.String("task", t.Name()), zap.String("runAt", nextRun.Format(time.RFC3339)))
o.taskQueue.Push(scheduledTask{ o.taskQueue.Push(scheduledTask{
task: t, task: t,
runAt: *nextRun, runAt: *nextRun,
priority: priority,
}) })
} }

2
webui/src/components/OperationList.tsx
View File

@@ -147,7 +147,7 @@ export const OperationRow = ({
parseInt(operation.unixTimeStartMs!) parseInt(operation.unixTimeStartMs!)
)}`; )}`;
} else if (operation.status === OperationStatus.STATUS_INPROGRESS) { } else if (operation.status === OperationStatus.STATUS_INPROGRESS) {
desc += " and is still running."; desc += " is still running.";
} }
return ( return (

4
webui/src/lib/formatting.ts
View File

@@ -48,7 +48,7 @@ export const formatDate = (time: number | string | Date) => {
}; };
export const formatDuration = (ms: number) => { export const formatDuration = (ms: number) => {
const seconds = Math.floor(ms / 100) / 10; const seconds = Math.ceil(ms / 100);
const minutes = Math.floor(seconds / 60); const minutes = Math.floor(seconds / 60);
const hours = Math.floor(minutes / 60); const hours = Math.floor(minutes / 60);
if (hours === 0 && minutes === 0) { if (hours === 0 && minutes === 0) {
@@ -56,7 +56,7 @@ export const formatDuration = (ms: number) => {
} else if (hours === 0) { } else if (hours === 0) {
return `${minutes}m${seconds % 60}s`; return `${minutes}m${seconds % 60}s`;
} }
return `${hours}h${minutes % 60}m${seconds % 60}s`; return `${hours}h${minutes % 60}m${Math.floor(seconds)}s`;
}; };
export const normalizeSnapshotId = (id: string) => { export const normalizeSnapshotId = (id: string) => {