Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🐛 quota blocked tasks should be included in queued. #745

Merged
merged 2 commits into from
Aug 19, 2024
Merged

🐛 quota blocked tasks should be included in queued. #745

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fec192e
:bug: quota blocked tasks should be included in queued.
jortel Aug 15, 2024
a1625b2
checkpoint
jortel Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions api/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ func (h TaskHandler) List(ctx *gin.Context) {
qf.Token{Kind: qf.STRING, Value: tasking.Ready},
qf.Token{Kind: qf.STRING, Value: tasking.Postponed},
qf.Token{Kind: qf.STRING, Value: tasking.Pending},
qf.Token{Kind: qf.STRING, Value: tasking.QuotaBlocked},
qf.Token{Kind: qf.STRING, Value: tasking.Running})
default:
values = append(values, v)
Expand Down Expand Up @@ -249,6 +250,7 @@ func (h TaskHandler) Queued(ctx *gin.Context) {
tasking.Ready,
tasking.Postponed,
tasking.Pending,
tasking.QuotaBlocked,
tasking.Running,
})
db = db.Group("State")
Expand All @@ -267,6 +269,8 @@ func (h TaskHandler) Queued(ctx *gin.Context) {
r.Postponed = q.Count
case tasking.Pending:
r.Pending = q.Count
case tasking.QuotaBlocked:
r.QuotaBlocked = q.Count
case tasking.Running:
r.Running = q.Count
}
Expand Down Expand Up @@ -902,11 +906,12 @@ func (r *TaskReport) Model() (m *model.TaskReport) {

// TaskQueue report.
type TaskQueue struct {
Total int `json:"total"`
Ready int `json:"ready"`
Postponed int `json:"postponed"`
Pending int `json:"pending"`
Running int `json:"running"`
Total int `json:"total"`
Ready int `json:"ready"`
Postponed int `json:"postponed"`
QuotaBlocked int `json:"quotaBlocked"`
Pending int `json:"pending"`
Running int `json:"running"`
}

// TaskDashboard report.
Expand Down
Loading