2 Commits

Author SHA1 Message Date
d3c5ee0dba Add pagination support for file loading in JobDetails component
All checks were successful
Release Tag / release (push) Successful in 20s
- Introduced a helper function to load all files associated with a job using pagination, improving performance by fetching files in batches.
- Updated the loadDetails function to utilize the new pagination method for retrieving all files instead of just the first page.
- Adjusted file handling logic to ensure proper updates when new files are added, maintaining consistency with the paginated approach.
2026-01-03 10:58:36 -06:00
bb57ce8659 Update task status handling to reset runner_id on job cancellation and failure
All checks were successful
Release Tag / release (push) Successful in 20s
- Modified SQL queries in multiple functions to set runner_id to NULL when updating task statuses for cancelled jobs and failed tasks.
- Ensured that tasks are properly marked as failed with the correct error messages and updated completion timestamps.
- Improved handling of task statuses to prevent potential issues with task assignment and execution.
2026-01-03 09:01:08 -06:00
3 changed files with 58 additions and 19 deletions

View File

@@ -944,7 +944,7 @@ func (s *Manager) handleCancelJob(w http.ResponseWriter, r *http.Request) {
// Cancel all pending tasks // Cancel all pending tasks
_, err = conn.Exec( _, err = conn.Exec(
`UPDATE tasks SET status = ? WHERE job_id = ? AND status = ?`, `UPDATE tasks SET status = ?, runner_id = NULL WHERE job_id = ? AND status = ?`,
types.TaskStatusFailed, jobID, types.TaskStatusPending, types.TaskStatusFailed, jobID, types.TaskStatusPending,
) )
return err return err

View File

@@ -390,7 +390,7 @@ func (s *Manager) handleNextJob(w http.ResponseWriter, r *http.Request) {
t.condition t.condition
FROM tasks t FROM tasks t
JOIN jobs j ON t.job_id = j.id JOIN jobs j ON t.job_id = j.id
WHERE t.status = ? AND j.status != ? WHERE t.status = ? AND t.runner_id IS NULL AND j.status != ?
ORDER BY t.created_at ASC ORDER BY t.created_at ASC
LIMIT 50`, LIMIT 50`,
types.TaskStatusPending, types.JobStatusCancelled, types.TaskStatusPending, types.JobStatusCancelled,
@@ -1363,7 +1363,7 @@ func (s *Manager) handleRunnerJobWebSocket(w http.ResponseWriter, r *http.Reques
log.Printf("Job WebSocket disconnected unexpectedly for task %d, marking as failed", taskID) log.Printf("Job WebSocket disconnected unexpectedly for task %d, marking as failed", taskID)
s.db.With(func(conn *sql.DB) error { s.db.With(func(conn *sql.DB) error {
_, err := conn.Exec( _, err := conn.Exec(
`UPDATE tasks SET status = ?, error_message = ?, completed_at = ? WHERE id = ?`, `UPDATE tasks SET status = ?, runner_id = NULL, error_message = ?, completed_at = ? WHERE id = ?`,
types.TaskStatusFailed, "WebSocket connection lost", time.Now(), taskID, types.TaskStatusFailed, "WebSocket connection lost", time.Now(), taskID,
) )
return err return err
@@ -1678,11 +1678,10 @@ func (s *Manager) handleWebSocketTaskComplete(runnerID int64, taskUpdate WSTaskU
} else { } else {
// No retries remaining - mark as failed // No retries remaining - mark as failed
err = s.db.WithTx(func(tx *sql.Tx) error { err = s.db.WithTx(func(tx *sql.Tx) error {
_, err := tx.Exec(`UPDATE tasks SET status = ? WHERE id = ?`, types.TaskStatusFailed, taskUpdate.TaskID) _, err := tx.Exec(
if err != nil { `UPDATE tasks SET status = ?, runner_id = NULL, completed_at = ? WHERE id = ?`,
return err types.TaskStatusFailed, now, taskUpdate.TaskID,
} )
_, err = tx.Exec(`UPDATE tasks SET completed_at = ? WHERE id = ?`, now, taskUpdate.TaskID)
if err != nil { if err != nil {
return err return err
} }
@@ -1849,7 +1848,7 @@ func (s *Manager) cancelActiveTasksForJob(jobID int64) error {
// Tasks don't have a cancelled status - mark them as failed instead // Tasks don't have a cancelled status - mark them as failed instead
err := s.db.With(func(conn *sql.DB) error { err := s.db.With(func(conn *sql.DB) error {
_, err := conn.Exec( _, err := conn.Exec(
`UPDATE tasks SET status = ?, error_message = ? WHERE job_id = ? AND status IN (?, ?)`, `UPDATE tasks SET status = ?, runner_id = NULL, error_message = ? WHERE job_id = ? AND status IN (?, ?)`,
types.TaskStatusFailed, "Job cancelled", jobID, types.TaskStatusPending, types.TaskStatusRunning, types.TaskStatusFailed, "Job cancelled", jobID, types.TaskStatusPending, types.TaskStatusRunning,
) )
if err != nil { if err != nil {

View File

@@ -111,6 +111,41 @@ export default function JobDetails({ job, onClose, onUpdate }) {
}); });
}, [taskData]); }, [taskData]);
// Helper function to load all files with pagination
const loadAllFiles = async (jobId, signal) => {
const allFiles = [];
let offset = 0;
const limit = 100; // Load 100 files per page
let hasMore = true;
while (hasMore && !signal?.aborted) {
const fileList = await jobs.getFiles(jobId, { limit, offset, signal });
// Check for superseded sentinel
if (fileList === REQUEST_SUPERSEDED) {
return REQUEST_SUPERSEDED;
}
const fileData = fileList?.data || fileList;
const files = Array.isArray(fileData) ? fileData : [];
allFiles.push(...files);
// Check if there are more files to load
const total = fileList?.total;
if (total !== undefined) {
hasMore = offset + files.length < total;
} else {
// If total is not provided, check if we got a full page (or more)
// Use >= to safely handle edge cases where API returns different amounts
hasMore = files.length >= limit;
}
offset += files.length;
}
return allFiles;
};
const loadDetails = async () => { const loadDetails = async () => {
// Guard against undefined job or job.id // Guard against undefined job or job.id
if (!job || !job.id) { if (!job || !job.id) {
@@ -122,9 +157,9 @@ export default function JobDetails({ job, onClose, onUpdate }) {
setLoading(true); setLoading(true);
// Use summary endpoint for tasks initially - much faster // Use summary endpoint for tasks initially - much faster
const signal = abortControllerRef.current?.signal; const signal = abortControllerRef.current?.signal;
const [details, fileList, taskListResult] = await Promise.all([ const [details, allFilesResult, taskListResult] = await Promise.all([
jobs.get(job.id, { signal }), jobs.get(job.id, { signal }),
jobs.getFiles(job.id, { limit: 50, signal }), // Only load first page of files loadAllFiles(job.id, signal), // Load all files with pagination
jobs.getTasksSummary(job.id, { sort: 'frame:asc', signal }), // Get all tasks jobs.getTasksSummary(job.id, { sort: 'frame:asc', signal }), // Get all tasks
]); ]);
@@ -135,11 +170,10 @@ export default function JobDetails({ job, onClose, onUpdate }) {
setJobDetails(details); setJobDetails(details);
// Handle paginated file response - check for superseded sentinel // Handle paginated file response - check for superseded sentinel
if (fileList === REQUEST_SUPERSEDED) { if (allFilesResult === REQUEST_SUPERSEDED) {
return; // Request was superseded, skip this update return; // Request was superseded, skip this update
} }
const fileData = fileList?.data || fileList; setFiles(Array.isArray(allFilesResult) ? allFilesResult : []);
setFiles(Array.isArray(fileData) ? fileData : []);
// Handle paginated task summary response - check for superseded sentinel // Handle paginated task summary response - check for superseded sentinel
if (taskListResult === REQUEST_SUPERSEDED) { if (taskListResult === REQUEST_SUPERSEDED) {
@@ -617,16 +651,22 @@ export default function JobDetails({ job, onClose, onUpdate }) {
}; };
reloadTasks(); reloadTasks();
} else if (data.type === 'file_added' && data.data) { } else if (data.type === 'file_added' && data.data) {
// New file was added - reload file list // New file was added - reload all files
const reloadFiles = async () => { const reloadFiles = async () => {
try { try {
const fileList = await jobs.getFiles(job.id, { limit: 50 }); const signal = abortControllerRef.current?.signal;
const allFilesResult = await loadAllFiles(job.id, signal);
// Check if request was aborted
if (signal?.aborted) {
return;
}
// Check for superseded sentinel // Check for superseded sentinel
if (fileList === REQUEST_SUPERSEDED) { if (allFilesResult === REQUEST_SUPERSEDED) {
return; // Request was superseded, skip this update return; // Request was superseded, skip this update
} }
const fileData = fileList.data || fileList; setFiles(Array.isArray(allFilesResult) ? allFilesResult : []);
setFiles(Array.isArray(fileData) ? fileData : []);
} catch (error) { } catch (error) {
console.error('Failed to reload files:', error); console.error('Failed to reload files:', error);
} }