prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #783 from vmarmol/fix

Browse Source 
Fix mirrored network stats
This commit is contained in:
Rohit Jnagal 2015-06-25 12:21:34 -07:00
commit 0918a70c49
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container/docker/handler.go
View File

@ -276,7 +276,7 @@ func (self *dockerContainerHandler) GetStats() (*info.ContainerStats, error) {
} }
func convertInterfaceStats(stats *info.InterfaceStats) { func convertInterfaceStats(stats *info.InterfaceStats) {
net := stats net := *stats
// Ingress for host veth is from the container. // Ingress for host veth is from the container.
// Hence tx_bytes stat on the host veth is actually number of bytes received by the container. // Hence tx_bytes stat on the host veth is actually number of bytes received by the container.

12
integration/tests/api/docker_test.go
View File

@ -249,7 +249,7 @@ func TestDockerContainerNetworkStats(t *testing.T) {
defer fm.Cleanup() defer fm.Cleanup()
// Wait for the container to show up. // Wait for the container to show up.
containerId := fm.Docker().RunBusybox("ping", "www.google.com") containerId := fm.Docker().RunBusybox("sh", "-c", "wget www.google.com && ping www.google.com")
waitForContainer(containerId, fm) waitForContainer(containerId, fm)
request := &info.ContainerInfoRequest{ request := &info.ContainerInfoRequest{
@ -261,7 +261,11 @@ func TestDockerContainerNetworkStats(t *testing.T) {
// Checks for NetworkStats. // Checks for NetworkStats.
stat := containerInfo.Stats[0] stat := containerInfo.Stats[0]
assert.NotEqual(t, 0, stat.Network.TxBytes, "Network tx bytes should not be zero") assert := assert.New(t)
assert.NotEqual(t, 0, stat.Network.TxPackets, "Network tx packets should not be zero") assert.NotEqual(0, stat.Network.TxBytes, "Network tx bytes should not be zero")
// TODO(vmarmol): Can probably do a better test with two containers pinging each other. assert.NotEqual(0, stat.Network.TxPackets, "Network tx packets should not be zero")
assert.NotEqual(0, stat.Network.RxBytes, "Network rx bytes should not be zero")
assert.NotEqual(0, stat.Network.RxPackets, "Network rx packets should not be zero")
assert.NotEqual(stat.Network.RxBytes, stat.Network.TxBytes, "Network tx and rx bytes should not be equal")
assert.NotEqual(stat.Network.RxPackets, stat.Network.TxPackets, "Network tx and rx packets should not be equal")
} }