mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
ecfddcf227
Send "Name" and "ID" when stating stopped containers
(cherry picked from commit 22472c8be5
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
160 lines
4 KiB
Go
160 lines
4 KiB
Go
package daemon
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"runtime"
|
|
"time"
|
|
|
|
"golang.org/x/net/context"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/backend"
|
|
"github.com/docker/docker/api/types/versions"
|
|
"github.com/docker/docker/api/types/versions/v1p20"
|
|
"github.com/docker/docker/container"
|
|
"github.com/docker/docker/pkg/ioutils"
|
|
)
|
|
|
|
// ContainerStats writes information about the container to the stream
|
|
// given in the config object.
|
|
func (daemon *Daemon) ContainerStats(ctx context.Context, prefixOrName string, config *backend.ContainerStatsConfig) error {
|
|
if runtime.GOOS == "solaris" {
|
|
return fmt.Errorf("%+v does not support stats", runtime.GOOS)
|
|
}
|
|
// Engine API version (used for backwards compatibility)
|
|
apiVersion := config.Version
|
|
|
|
container, err := daemon.GetContainer(prefixOrName)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// 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.StatsJSON{
|
|
Name: container.Name,
|
|
ID: container.ID})
|
|
}
|
|
|
|
outStream := config.OutStream
|
|
if config.Stream {
|
|
wf := ioutils.NewWriteFlusher(outStream)
|
|
defer wf.Close()
|
|
wf.Flush()
|
|
outStream = wf
|
|
}
|
|
|
|
var preCPUStats types.CPUStats
|
|
var preRead time.Time
|
|
getStatJSON := func(v interface{}) *types.StatsJSON {
|
|
ss := v.(types.StatsJSON)
|
|
ss.Name = container.Name
|
|
ss.ID = container.ID
|
|
ss.PreCPUStats = preCPUStats
|
|
ss.PreRead = preRead
|
|
preCPUStats = ss.CPUStats
|
|
preRead = ss.Read
|
|
return &ss
|
|
}
|
|
|
|
enc := json.NewEncoder(outStream)
|
|
|
|
updates := daemon.subscribeToContainerStats(container)
|
|
defer daemon.unsubscribeToContainerStats(container, updates)
|
|
|
|
noStreamFirstFrame := true
|
|
for {
|
|
select {
|
|
case v, ok := <-updates:
|
|
if !ok {
|
|
return nil
|
|
}
|
|
|
|
var statsJSON interface{}
|
|
statsJSONPost120 := getStatJSON(v)
|
|
if versions.LessThan(apiVersion, "1.21") {
|
|
if runtime.GOOS == "windows" {
|
|
return errors.New("API versions pre v1.21 do not support stats on Windows")
|
|
}
|
|
var (
|
|
rxBytes uint64
|
|
rxPackets uint64
|
|
rxErrors uint64
|
|
rxDropped uint64
|
|
txBytes uint64
|
|
txPackets uint64
|
|
txErrors uint64
|
|
txDropped uint64
|
|
)
|
|
for _, v := range statsJSONPost120.Networks {
|
|
rxBytes += v.RxBytes
|
|
rxPackets += v.RxPackets
|
|
rxErrors += v.RxErrors
|
|
rxDropped += v.RxDropped
|
|
txBytes += v.TxBytes
|
|
txPackets += v.TxPackets
|
|
txErrors += v.TxErrors
|
|
txDropped += v.TxDropped
|
|
}
|
|
statsJSON = &v1p20.StatsJSON{
|
|
Stats: statsJSONPost120.Stats,
|
|
Network: types.NetworkStats{
|
|
RxBytes: rxBytes,
|
|
RxPackets: rxPackets,
|
|
RxErrors: rxErrors,
|
|
RxDropped: rxDropped,
|
|
TxBytes: txBytes,
|
|
TxPackets: txPackets,
|
|
TxErrors: txErrors,
|
|
TxDropped: txDropped,
|
|
},
|
|
}
|
|
} else {
|
|
statsJSON = statsJSONPost120
|
|
}
|
|
|
|
if !config.Stream && noStreamFirstFrame {
|
|
// prime the cpu stats so they aren't 0 in the final output
|
|
noStreamFirstFrame = false
|
|
continue
|
|
}
|
|
|
|
if err := enc.Encode(statsJSON); err != nil {
|
|
return err
|
|
}
|
|
|
|
if !config.Stream {
|
|
return nil
|
|
}
|
|
case <-ctx.Done():
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
|
|
func (daemon *Daemon) subscribeToContainerStats(c *container.Container) chan interface{} {
|
|
return daemon.statsCollector.collect(c)
|
|
}
|
|
|
|
func (daemon *Daemon) unsubscribeToContainerStats(c *container.Container, ch chan interface{}) {
|
|
daemon.statsCollector.unsubscribe(c, ch)
|
|
}
|
|
|
|
// GetContainerStats collects all the stats published by a container
|
|
func (daemon *Daemon) GetContainerStats(container *container.Container) (*types.StatsJSON, error) {
|
|
stats, err := daemon.stats(container)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// We already have the network stats on Windows directly from HCS.
|
|
if !container.Config.NetworkDisabled && runtime.GOOS != "windows" {
|
|
if stats.Networks, err = daemon.getNetworkStats(container); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
return stats, nil
|
|
}
|