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

gofmt -r "ContainerInfoQuery->ContainerInfoRequest"

Browse Source
This commit is contained in:
Nan Deng 2014-07-08 18:04:57 -07:00
parent 6a5a395fbd
commit 6818ac9b9f
7 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/handler.go
View File

@ -70,7 +70,7 @@ func HandleRequest(m manager.Manager, w http.ResponseWriter, r *http.Request) er
log.Printf("Api - Container(%s)", containerName) log.Printf("Api - Container(%s)", containerName)
var query info.ContainerInfoQuery var query info.ContainerInfoRequest
decoder := json.NewDecoder(r.Body) decoder := json.NewDecoder(r.Body)
err := decoder.Decode(&query) err := decoder.Decode(&query)
if err != nil && err != io.EOF { if err != nil && err != io.EOF {

3
client/client.go
View File

@ -98,8 +98,7 @@ func (self *Client) httpGetJsonData(data, postData interface{}, url, infoName st
func (self *Client) ContainerInfo( func (self *Client) ContainerInfo(
name string, name string,
query *info.ContainerInfoQuery, query *info.ContainerInfoRequest) (cinfo *info.ContainerInfo, err error) {
) (cinfo *info.ContainerInfo, err error) {
u := self.containerInfoUrl(name) u := self.containerInfoUrl(name)
ret := new(info.ContainerInfo) ret := new(info.ContainerInfo)
err = self.httpGetJsonData(ret, query, u, fmt.Sprintf("container info for %v", name)) err = self.httpGetJsonData(ret, query, u, fmt.Sprintf("container info for %v", name))

4
client/client_test.go
View File

@ -92,7 +92,7 @@ func TestGetMachineinfo(t *testing.T) {
} }
func TestGetContainerInfo(t *testing.T) { func TestGetContainerInfo(t *testing.T) {
query := &info.ContainerInfoQuery{ query := &info.ContainerInfoRequest{
NumStats: 3, NumStats: 3,
NumSamples: 2, NumSamples: 2,
CpuUsagePercentiles: []int{10, 50, 90}, CpuUsagePercentiles: []int{10, 50, 90},
@ -100,7 +100,7 @@ func TestGetContainerInfo(t *testing.T) {
} }
containerName := "/some/container" containerName := "/some/container"
cinfo := itest.GenerateRandomContainerInfo(containerName, 4, query, 1*time.Second) cinfo := itest.GenerateRandomContainerInfo(containerName, 4, query, 1*time.Second)
client, server, err := cadvisorTestClient(fmt.Sprintf("/api/v1.0/containers%v", containerName), query, &info.ContainerInfoQuery{}, cinfo, t) client, server, err := cadvisorTestClient(fmt.Sprintf("/api/v1.0/containers%v", containerName), query, &info.ContainerInfoRequest{}, cinfo, t)
if err != nil { if err != nil {
t.Fatalf("unable to get a client %v", err) t.Fatalf("unable to get a client %v", err)
} }

6
info/container.go
View File

@ -60,7 +60,7 @@ type ContainerReference struct {
// ContainerInfoQuery is used when users check a container info from the REST api. // ContainerInfoQuery is used when users check a container info from the REST api.
// It specifies how much data users want to get about a container // It specifies how much data users want to get about a container
type ContainerInfoQuery struct { type ContainerInfoRequest 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"`
@ -68,10 +68,10 @@ type ContainerInfoQuery struct {
MemoryUsagePercentages []int `json:"memory_usage_percentiles,omitempty"` MemoryUsagePercentages []int `json:"memory_usage_percentiles,omitempty"`
} }
func (self *ContainerInfoQuery) FillDefaults() *ContainerInfoQuery { func (self *ContainerInfoRequest) FillDefaults() *ContainerInfoRequest {
ret := self ret := self
if ret == nil { if ret == nil {
ret = new(ContainerInfoQuery) ret = new(ContainerInfoRequest)
} }
if ret.NumStats <= 0 { if ret.NumStats <= 0 {
ret.NumStats = 1024 ret.NumStats = 1024

2
info/test/datagen.go
View File

@ -68,7 +68,7 @@ func GenerateRandomContainerSpec(numCores int) *info.ContainerSpec {
return ret return ret
} }
func GenerateRandomContainerInfo(containerName string, numCores int, query *info.ContainerInfoQuery, duration time.Duration) *info.ContainerInfo { func GenerateRandomContainerInfo(containerName string, numCores int, query *info.ContainerInfoRequest, duration time.Duration) *info.ContainerInfo {
stats := GenerateRandomStats(query.NumStats, numCores, duration) stats := GenerateRandomStats(query.NumStats, numCores, duration)
samples, _ := info.NewSamplesFromStats(stats...) samples, _ := info.NewSamplesFromStats(stats...)
if len(samples) > query.NumSamples { if len(samples) > query.NumSamples {

4
manager/manager.go
View File

@ -30,7 +30,7 @@ type Manager interface {
Start() error Start() error
// Get information about a container. // Get information about a container.
GetContainerInfo(containerName string, query *info.ContainerInfoQuery) (*info.ContainerInfo, error) GetContainerInfo(containerName string, query *info.ContainerInfoRequest) (*info.ContainerInfo, error)
// Get information about the machine. // Get information about the machine.
GetMachineInfo() (*info.MachineInfo, error) GetMachineInfo() (*info.MachineInfo, error)
@ -106,7 +106,7 @@ func (m *manager) Start() error {
} }
// Get a container by name. // Get a container by name.
func (m *manager) GetContainerInfo(containerName string, query *info.ContainerInfoQuery) (*info.ContainerInfo, error) { func (m *manager) GetContainerInfo(containerName string, query *info.ContainerInfoRequest) (*info.ContainerInfo, error) {
log.Printf("Get(%s); %+v", containerName, query) log.Printf("Get(%s); %+v", containerName, query)
var cont *containerData var cont *containerData
var ok bool var ok bool

4
manager/manager_test.go
View File

@ -77,7 +77,7 @@ func TestGetContainerInfo(t *testing.T) {
"/c2", "/c2",
} }
query := &info.ContainerInfoQuery{ query := &info.ContainerInfoRequest{
NumStats: 256, NumStats: 256,
NumSamples: 128, NumSamples: 128,
CpuUsagePercentiles: []int{10, 50, 90}, CpuUsagePercentiles: []int{10, 50, 90},
@ -169,7 +169,7 @@ func TestGetContainerInfoWithDefaultValue(t *testing.T) {
"/c2", "/c2",
} }
var query *info.ContainerInfoQuery var query *info.ContainerInfoRequest
query = query.FillDefaults() query = query.FillDefaults()
infosMap := make(map[string]*info.ContainerInfo, len(containers)) infosMap := make(map[string]*info.ContainerInfo, len(containers))