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.

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

Jump to bottom

Adjust uninstall delay log entry when deleting data #833

Merged
merged 1 commit into from
Nov 16, 2022
Merged

Adjust uninstall delay log entry when deleting data #833

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
8 changes: 7 additions & 1 deletion pkg/machinery/uninstall/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,13 @@ func (DefaultPendingHandler) OnTaskPending(ctx context.Context, ti task.ActiveTa
now := time.Now()
// sleep until endTime or context is cancelled
if endTime.After(now) {
ti.AddLogEntry(zapcore.InfoLevel, fmt.Sprintf("Delaying uninstall until %s (%s from now)", endTime.Format(time.Stamp), endTime.Sub(now).Round(time.Second)))
var format string
if md.DeleteStoredData {
format = "Delaying uninstall and data deletion until %s (%s from now)"
} else {
format = "Delaying uninstall until %s (%s from now)"
}
ti.AddLogEntry(zapcore.InfoLevel, fmt.Sprintf(format, endTime.Format(time.Stamp), endTime.Sub(now).Round(time.Second)))
timer := time.NewTimer(endTime.Sub(now))
defer timer.Stop()
select {
Expand Down