mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #32259 from ZTE-PaaS/zhangke-patch-040
Automatic merge from submit-queue Improving StopContainer failed log level Using at least Warning level will be more property
This commit is contained in:
commit
5ffb523cf8
@ -1505,7 +1505,7 @@ func (dm *DockerManager) killContainer(containerID kubecontainer.ContainerID, co
|
|||||||
}()
|
}()
|
||||||
select {
|
select {
|
||||||
case <-time.After(time.Duration(gracePeriod) * time.Second):
|
case <-time.After(time.Duration(gracePeriod) * time.Second):
|
||||||
glog.V(2).Infof("preStop hook for container %q did not complete in %d seconds", name, gracePeriod)
|
glog.Warningf("preStop hook for container %q did not complete in %d seconds", name, gracePeriod)
|
||||||
case <-done:
|
case <-done:
|
||||||
glog.V(4).Infof("preStop hook for container %q completed", name)
|
glog.V(4).Infof("preStop hook for container %q completed", name)
|
||||||
}
|
}
|
||||||
@ -1530,7 +1530,7 @@ func (dm *DockerManager) killContainer(containerID kubecontainer.ContainerID, co
|
|||||||
if err == nil {
|
if err == nil {
|
||||||
glog.V(2).Infof("Container %q exited after %s", name, unversioned.Now().Sub(start.Time))
|
glog.V(2).Infof("Container %q exited after %s", name, unversioned.Now().Sub(start.Time))
|
||||||
} else {
|
} else {
|
||||||
glog.V(2).Infof("Container %q termination failed after %s: %v", name, unversioned.Now().Sub(start.Time), err)
|
glog.Warningf("Container %q termination failed after %s: %v", name, unversioned.Now().Sub(start.Time), err)
|
||||||
}
|
}
|
||||||
ref, ok := dm.containerRefManager.GetRef(containerID)
|
ref, ok := dm.containerRefManager.GetRef(containerID)
|
||||||
if !ok {
|
if !ok {
|
||||||
|
Loading…
Reference in New Issue
Block a user