зеркало из https://github.com/microsoft/docker.git
Return an empty stats if the container is restarting
In case, a container is restarting indefinitely running "docker stats --no-stream <restarting_container>" is suspended. To fix this, the daemon makes sure the container is either not running or restarting if `--no-stream` is set to true and if so returns an empty stats. Should fix #27772. Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
This commit is contained in:
Родитель
1f4137857f
Коммит
786a95493d
|
@ -27,8 +27,8 @@ func (daemon *Daemon) ContainerStats(ctx context.Context, prefixOrName string, c
|
|||
return err
|
||||
}
|
||||
|
||||
// If the container is not running and requires no stream, return an empty stats.
|
||||
if !container.IsRunning() && !config.Stream {
|
||||
// If the container is either not running or restarting and requires no stream, return an empty stats.
|
||||
if (!container.IsRunning() || container.IsRestarting()) && !config.Stream {
|
||||
return json.NewEncoder(config.OutStream).Encode(&types.Stats{})
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче