Skip to content

feat(TaskProcessing): Update completionExpectedAt in Manager#setTaskProgress #61190

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

Open
marcelklehr wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −0
Open

feat(TaskProcessing): Update completionExpectedAt in Manager#setTaskProgress #61190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions lib/private/TaskProcessing/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,6 +1255,19 @@ public function setTaskProgress(int $id, float $progress): bool {
}
$task->setStatus(Task::STATUS_RUNNING);
$task->setProgress($progress);
// Refine the expected completion time from the actual progress reported so far.
// We need a positive elapsed time and a positive progress to avoid divide-by-zero
// and the wildly unstable estimates produced when progress is still near zero.
$startedAt = $task->getStartedAt();
if ($startedAt !== null && $progress > 0.0) {
$elapsed = time() - $startedAt;
if ($elapsed > 0) {
$remainingSeconds = (int)ceil($elapsed * (1.0 - $progress) / $progress);
$completionExpectedAt = new \DateTime('now');
$completionExpectedAt->add(new \DateInterval('PT' . $remainingSeconds . 'S'));
$task->setCompletionExpectedAt($completionExpectedAt);
}
}
$taskEntity = \OC\TaskProcessing\Db\Task::fromPublicTask($task);
try {
$this->taskMapper->update($taskEntity);
Expand Down
Loading