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.

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

[WIP] Fix incorrect count of pending transfers when a job is resumed #2961

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion cmd/jobsResume.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,13 @@ func (cca *resumeJobController) ReportProgressOrExit(lcm common.LifecycleMgr) (t
// indicate whether constrained by disk or not
perfString, diskString := getPerfDisplayText(summary.PerfStrings, summary.PerfConstraint, duration, false)

var xfersDoneFailSkip = summary.TransfersCompleted + summary.TransfersFailed + summary.TransfersSkipped
pending := common.Iff(summary.TotalTransfers > xfersDoneFailSkip, summary.TotalTransfers-xfersDoneFailSkip, 0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will have to figure out why are we getting this negative value instead of just setting this value to 0.

return fmt.Sprintf("%.1f %%, %v Done, %v Failed, %v Pending, %v Skipped, %v Total%s, %s%s%s",
summary.PercentComplete,
summary.TransfersCompleted,
summary.TransfersFailed,
summary.TotalTransfers-(summary.TransfersCompleted+summary.TransfersFailed+summary.TransfersSkipped),
pending,
summary.TransfersSkipped, summary.TotalTransfers, scanningString, perfString, throughputString, diskString)
}
})
Expand Down
Loading