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

Merge pull request #41246 from kargakis/more-logging 

Automatic merge from submit-queue (batch tested with PRs 41246, 39998)

Add more logs during the progress check

@soltysh this is needed for debugging https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/logs/ci-kubernetes-e2e-gci-gke/4460#k8sio-deployment-lack-of-progress-should-be-reported-in-the-deployment-status

Probably the last set of logs I will need for this one. I have opened https://github.com/kubernetes/kubernetes/issues/41187 to reduce the verbosity level before 1.6 ships.
pull/6/head
Kubernetes Submit Queue 2017-02-10 07:53:49 -08:00 committed by GitHub
parent e9de1b0221 e13c3e481c
commit f02282cfed
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,11 +64,15 @@ func (dc *DeploymentController) hasFailed(d *extensions.Deployment) (bool, error
// If the deployment is complete or it is progressing, there is no need to check if it
// has timed out.
// TODO: Switch to a much higher verbosity level
glog.V(2).Infof("Checking if deployment %q is complete or progressing", d.Name)
if util.DeploymentComplete(d, &newStatus) || util.DeploymentProgressing(d, &newStatus) {
return false, nil
}
// Check if the deployment has timed out.
// TODO: Switch to a much higher verbosity level
glog.V(2).Infof("Checking if deployment %q has timed out", d.Name)
return util.DeploymentTimedOut(d, &newStatus), nil
}

7
pkg/controller/deployment/util/deployment_util.go
View File

@ -867,8 +867,13 @@ func DeploymentTimedOut(deployment *extensions.Deployment, newStatus *extensions
// progress or tried to create a replica set, or resumed a paused deployment and
// compare against progressDeadlineSeconds.
from := condition.LastUpdateTime
now := nowFn()
delta := time.Duration(*deployment.Spec.ProgressDeadlineSeconds) * time.Second
return from.Add(delta).Before(nowFn())
timedOut := from.Add(delta).Before(now)
// TODO: Switch to a much higher verbosity level
glog.V(2).Infof("Deployment %q timed out (%t) [last progress check: %v - now: %v]", deployment.Name, timedOut, from, now)
return timedOut
}
// NewRSNewReplicas calculates the number of replicas a deployment's new RS should have.