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

gofmt -r "CpuUsagePercentages->CpuUsagePercentiles"

Browse Source
This commit is contained in:
Nan Deng 2014-07-08 17:20:04 -07:00
parent 115b132e5f
commit f2a0365766
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/client_test.go
View File

@ -95,7 +95,7 @@ func TestGetContainerInfo(t *testing.T) {
query := &info.ContainerInfoQuery{ query := &info.ContainerInfoQuery{
NumStats: 3, NumStats: 3,
NumSamples: 2, NumSamples: 2,
CpuUsagePercentages: []int{10, 50, 90}, CpuUsagePercentiles: []int{10, 50, 90},
MemoryUsagePercentages: []int{10, 80, 90}, MemoryUsagePercentages: []int{10, 80, 90},
} }
containerName := "/some/container" containerName := "/some/container"

9
info/container.go
View File

@ -58,12 +58,13 @@ type ContainerReference struct {
Aliases []string `json:"aliases,omitempty"` Aliases []string `json:"aliases,omitempty"`
} }
// ContainerInfoQuery specifies how much data users want to get about a container
type ContainerInfoQuery struct { type ContainerInfoQuery struct {
NumStats int `json:"num_stats,omitempty"` NumStats int `json:"num_stats,omitempty"`
NumSamples int `json:"num_samples,omitempty"` NumSamples int `json:"num_samples,omitempty"`
CpuUsagePercentages []int `json:"cpu_usage_percentages,omitempty"` CpuUsagePercentiles []int `json:"cpu_usage_percentiles,omitempty"`
MemoryUsagePercentages []int `json:"memory_usage_percentages,omitempty"` MemoryUsagePercentages []int `json:"memory_usage_percentiles,omitempty"`
} }
func (self *ContainerInfoQuery) FillWithDefaultValues() *ContainerInfoQuery { func (self *ContainerInfoQuery) FillWithDefaultValues() *ContainerInfoQuery {
@ -77,8 +78,8 @@ func (self *ContainerInfoQuery) FillWithDefaultValues() *ContainerInfoQuery {
if ret.NumSamples <= 0 { if ret.NumSamples <= 0 {
ret.NumSamples = 1024 ret.NumSamples = 1024
} }
if len(ret.CpuUsagePercentages) == 0 { if len(ret.CpuUsagePercentiles) == 0 {
ret.CpuUsagePercentages = []int{50, 80, 90, 99} ret.CpuUsagePercentiles = []int{50, 80, 90, 99}
} }
if len(ret.MemoryUsagePercentages) == 0 { if len(ret.MemoryUsagePercentages) == 0 {
ret.MemoryUsagePercentages = []int{50, 80, 90, 99} ret.MemoryUsagePercentages = []int{50, 80, 90, 99}

4
info/test/datagen.go
View File

@ -74,11 +74,11 @@ func GenerateRandomContainerInfo(containerName string, numCores int, query *info
if len(samples) > query.NumSamples { if len(samples) > query.NumSamples {
samples = samples[:query.NumSamples] samples = samples[:query.NumSamples]
} }
cpuPercentiles := make([]info.Percentile, 0, len(query.CpuUsagePercentages)) cpuPercentiles := make([]info.Percentile, 0, len(query.CpuUsagePercentiles))
// TODO(monnand): This will generate percentiles where 50%tile data may // TODO(monnand): This will generate percentiles where 50%tile data may
// be larger than 90%tile data. // be larger than 90%tile data.
for _, p := range query.CpuUsagePercentages { for _, p := range query.CpuUsagePercentiles {
percentile := info.Percentile{p, uint64(rand.Int63n(1000))} percentile := info.Percentile{p, uint64(rand.Int63n(1000))}
cpuPercentiles = append(cpuPercentiles, percentile) cpuPercentiles = append(cpuPercentiles, percentile)
} }

2
manager/manager.go
View File

@ -133,7 +133,7 @@ func (m *manager) GetContainerInfo(containerName string, query *info.ContainerIn
query = query.FillWithDefaultValues() query = query.FillWithDefaultValues()
percentiles, err = m.storageDriver.Percentiles( percentiles, err = m.storageDriver.Percentiles(
cinfo.Name, cinfo.Name,
query.CpuUsagePercentages, query.CpuUsagePercentiles,
query.MemoryUsagePercentages, query.MemoryUsagePercentages,
) )
if err != nil { if err != nil {

6
manager/manager_test.go
View File

@ -80,7 +80,7 @@ func TestGetContainerInfo(t *testing.T) {
query := &info.ContainerInfoQuery{ query := &info.ContainerInfoQuery{
NumStats: 256, NumStats: 256,
NumSamples: 128, NumSamples: 128,
CpuUsagePercentages: []int{10, 50, 90}, CpuUsagePercentiles: []int{10, 50, 90},
MemoryUsagePercentages: []int{10, 80, 90}, MemoryUsagePercentages: []int{10, 80, 90},
} }
@ -104,7 +104,7 @@ func TestGetContainerInfo(t *testing.T) {
driver.On( driver.On(
"Percentiles", "Percentiles",
h.Name, h.Name,
query.CpuUsagePercentages, query.CpuUsagePercentiles,
query.MemoryUsagePercentages, query.MemoryUsagePercentages,
).Return( ).Return(
percentiles, percentiles,
@ -192,7 +192,7 @@ func TestGetContainerInfoWithDefaultValue(t *testing.T) {
driver.On( driver.On(
"Percentiles", "Percentiles",
h.Name, h.Name,
query.CpuUsagePercentages, query.CpuUsagePercentiles,
query.MemoryUsagePercentages, query.MemoryUsagePercentages,
).Return( ).Return(
percentiles, percentiles,