Skip to content

Commit

Permalink
fix(framework): fix finished_record count in _devlake_subtasks (#8054)
Browse files Browse the repository at this point in the history
  • Loading branch information
d4x1 authored and narrowizard committed Oct 23, 2024
1 parent 2cadbf8 commit 269e306
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions backend/core/runner/run_task.go
Original file line number Diff line number Diff line change
Expand Up @@ -369,19 +369,17 @@ func UpdateProgressDetail(basicRes context.BasicRes, taskId uint64, progressDeta
progressDetail.TotalRecords = p.Total
case plugin.SubTaskIncProgress:
progressDetail.FinishedRecords = p.Current
// update subtask progress
where := dal.Where("task_id = ? and name = ?", taskId, progressDetail.SubTaskName)
err := basicRes.GetDal().UpdateColumns(subtask, []dal.DalSet{
{ColumnName: "finished_records", Value: progressDetail.FinishedRecords},
}, where)
if err != nil {
basicRes.GetLogger().Error(err, "failed to update _devlake_subtasks progress")
}
case plugin.SetCurrentSubTask:
progressDetail.SubTaskName = p.SubTaskName
progressDetail.SubTaskNumber = p.SubTaskNumber
default:
return
}
// update subtask progress
where := dal.Where("task_id = ? and name = ?", taskId, progressDetail.SubTaskName)
err := basicRes.GetDal().UpdateColumns(subtask, []dal.DalSet{
{ColumnName: "finished_records", Value: progressDetail.FinishedRecords},
}, where)
if err != nil {
basicRes.GetLogger().Error(err, "failed to update _devlake_subtasks progress")
}
}

Expand Down Expand Up @@ -417,7 +415,7 @@ func recordSubtask(basicRes context.BasicRes, subtask *models.Subtask) {
{ColumnName: "began_at", Value: subtask.BeganAt},
{ColumnName: "finished_at", Value: subtask.FinishedAt},
{ColumnName: "spent_seconds", Value: subtask.SpentSeconds},
{ColumnName: "finished_records", Value: subtask.FinishedRecords},
//{ColumnName: "finished_records", Value: subtask.FinishedRecords}, // FinishedRecords is zero always.
{ColumnName: "number", Value: subtask.Number},
}, where); err != nil {
basicRes.GetLogger().Error(err, "error writing subtask %d status to DB: %v", subtask.ID)
Expand Down

0 comments on commit 269e306

Please sign in to comment.