github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #41131 from kargakis/another-test-update 

Automatic merge from submit-queue

Add more logs in the progress check path

Follow-up to https://github.com/kubernetes/kubernetes/pull/41097

@mfojtik quick look here
pull/6/head
Kubernetes Submit Queue 2017-02-08 07:11:11 -08:00 committed by GitHub
parent fd56078298 38195704be
commit 74cf0484c3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/deployment/deployment_controller.go
View File

@ -763,6 +763,7 @@ func (dc *DeploymentController) checkNextItemForProgress() bool {
utilruntime.HandleError(err)
}
if err == nil && needsResync {
glog.V(2).Infof("Deployment %q has failed progressing - syncing it back to the main queue for an update", key.(string))
dc.queue.AddRateLimited(key)
}
dc.progressQueue.Forget(key)
@ -796,5 +797,6 @@ func (dc *DeploymentController) checkForProgress(key string) (bool, error) {
if err != nil {
return false, err
}
glog.V(2).Infof("Syncing deployment %q for a progress check", key)
return dc.hasFailed(d)
}

2
pkg/controller/deployment/progress.go
View File

@ -158,7 +158,7 @@ func (dc *DeploymentController) syncRolloutStatus(allRSs []*extensions.ReplicaSe
currentCond != nil {
after := time.Now().Add(time.Duration(*d.Spec.ProgressDeadlineSeconds) * time.Second).Sub(currentCond.LastUpdateTime.Time)
glog.V(4).Infof("Queueing up deployment %q for a progress check after %ds", d.Name, int(after.Seconds()))
glog.V(2).Infof("Queueing up deployment %q for a progress check after %ds", d.Name, int(after.Seconds()))
dc.checkProgressAfter(d, after)
}
return nil