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

remove FillDefaults()

Browse Source
This commit is contained in:
Nan Deng 2014-07-23 17:55:25 -07:00
parent 55b65f4eb9
commit 2ac720aa3f
3 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
info/container.go
View File

@ -72,26 +72,6 @@ type ContainerInfoRequest struct {
MemoryUsagePercentages []int `json:"memory_usage_percentiles,omitempty"` MemoryUsagePercentages []int `json:"memory_usage_percentiles,omitempty"`
} }
func (self *ContainerInfoRequest) FillDefaults() *ContainerInfoRequest {
ret := self
if ret == nil {
ret = new(ContainerInfoRequest)
}
if ret.NumStats < 0 {
ret.NumStats = 1024
}
if ret.NumSamples < 0 {
ret.NumSamples = 1024
}
if len(ret.CpuUsagePercentiles) == 0 {
ret.CpuUsagePercentiles = []int{50, 80, 90, 99}
}
if len(ret.MemoryUsagePercentages) == 0 {
ret.MemoryUsagePercentages = []int{50, 80, 90, 99}
}
return ret
}
type ContainerInfo struct { type ContainerInfo struct {
ContainerReference ContainerReference

1
manager/manager.go
View File

@ -130,7 +130,6 @@ func (m *manager) GetContainerInfo(containerName string, query *info.ContainerIn
var percentiles *info.ContainerStatsPercentiles var percentiles *info.ContainerStatsPercentiles
var samples []*info.ContainerStatsSample var samples []*info.ContainerStatsSample
var stats []*info.ContainerStats var stats []*info.ContainerStats
query = query.FillDefaults()
percentiles, err = m.storageDriver.Percentiles( percentiles, err = m.storageDriver.Percentiles(
cinfo.Name, cinfo.Name,
query.CpuUsagePercentiles, query.CpuUsagePercentiles,

8
manager/manager_test.go
View File

@ -169,8 +169,12 @@ func TestGetContainerInfoWithDefaultValue(t *testing.T) {
"/c2", "/c2",
} }
var query *info.ContainerInfoRequest query := &info.ContainerInfoRequest{
query = query.FillDefaults() NumStats: 64,
NumSamples: 64,
CpuUsagePercentiles: {50, 80, 90},
MemoryUsagePercentiles: {50, 80, 90},
}
infosMap := make(map[string]*info.ContainerInfo, len(containers)) infosMap := make(map[string]*info.ContainerInfo, len(containers))
handlerMap := make(map[string]*container.MockContainerHandler, len(containers)) handlerMap := make(map[string]*container.MockContainerHandler, len(containers))