Skip to content

Commit 5f6fd8e

Browse files
authored
Tasks page didn't include Delayed runs (#2176)
* Delayed runs weren’t shown in the Tasks page mini graph * The Tasks page Queued count didn’t include Delayed runs (since ClickHouse switchover)
1 parent 33e1008 commit 5f6fd8e

File tree

2 files changed

+3
-2
lines changed
  • apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index
  • internal-packages/clickhouse/src

2 files changed

+3
-2
lines changed

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@ function TaskActivityGraph({ activity }: { activity: TaskActivity }) {
503503
barSize={10}
504504
isAnimationActive={false}
505505
/>
506+
<Bar dataKey="DELAYED" fill="#5F6570" stackId="a" strokeWidth={0} barSize={10} />
506507
<Bar dataKey="PENDING" fill="#5F6570" stackId="a" strokeWidth={0} barSize={10} />
507508
<Bar dataKey="PENDING_VERSION" fill="#F59E0B" stackId="a" strokeWidth={0} barSize={10} />
508509
<Bar dataKey="EXECUTING" fill="#3B82F6" stackId="a" strokeWidth={0} barSize={10} />
@@ -533,7 +534,7 @@ function TaskActivityGraph({ activity }: { activity: TaskActivity }) {
533534
<Bar dataKey="SYSTEM_FAILURE" fill="#F43F5E" stackId="a" strokeWidth={0} barSize={10} />
534535
<Bar dataKey="PAUSED" fill="#FCD34D" stackId="a" strokeWidth={0} barSize={10} />
535536
<Bar dataKey="CRASHED" fill="#F43F5E" stackId="a" strokeWidth={0} barSize={10} />
536-
<Bar dataKey="EXPIRED" fill="#F43F5E" stackId="a" strokeWidth={0} barSize={10} />
537+
<Bar dataKey="EXPIRED" fill="#5F6570" stackId="a" strokeWidth={0} barSize={10} />
537538
<Bar dataKey="TIMED_OUT" fill="#F43F5E" stackId="a" strokeWidth={0} barSize={10} />
538539
</BarChart>
539540
</ResponsiveContainer>

internal-packages/clickhouse/src/taskRuns.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ export function getCurrentRunningStats(ch: ClickhouseReader, settings?: ClickHou
178178
organization_id = {organizationId: String}
179179
AND project_id = {projectId: String}
180180
AND environment_id = {environmentId: String}
181-
AND status IN ('PENDING', 'WAITING_FOR_DEPLOY', 'WAITING_TO_RESUME', 'QUEUED', 'EXECUTING')
181+
AND status IN ('PENDING', 'WAITING_FOR_DEPLOY', 'WAITING_TO_RESUME', 'QUEUED', 'EXECUTING', 'DELAYED')
182182
AND _is_deleted = 0
183183
AND created_at >= now() - INTERVAL {days: Int64} DAY
184184
GROUP BY

0 commit comments

Comments
 (0)