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

Fix subcontainer queries in subcontainers.

Browse Source 
Queries for root were not being correctly diagnosed.
This commit is contained in:
Victor Marmol 2015-04-20 11:46:36 -07:00
parent 44848b924c
commit f0ea740328
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
events/handler.go
View File

@ -174,7 +174,7 @@ func getMaxEventsReturned(request *Request, eSlice EventSlice) EventSlice {
// equivalent // equivalent
func checkIfIsSubcontainer(request *Request, event *info.Event) bool { func checkIfIsSubcontainer(request *Request, event *info.Event) bool {
if request.IncludeSubcontainers == true { if request.IncludeSubcontainers == true {
return strings.HasPrefix(event.ContainerName+"/", request.ContainerName+"/") return request.ContainerName == "/" || strings.HasPrefix(event.ContainerName+"/", request.ContainerName+"/")
} }
return event.ContainerName == request.ContainerName return event.ContainerName == request.ContainerName
} }

11
events/handler_test.go
View File

@ -67,6 +67,8 @@ func ensureProperEventReturned(t *testing.T, expectedEvent *info.Event, eventObj
func TestCheckIfIsSubcontainer(t *testing.T) { func TestCheckIfIsSubcontainer(t *testing.T) {
myRequest := NewRequest() myRequest := NewRequest()
myRequest.ContainerName = "/root" myRequest.ContainerName = "/root"
rootRequest := NewRequest()
rootRequest.ContainerName = "/"
sameContainerEvent := &info.Event{ sameContainerEvent := &info.Event{
ContainerName: "/root", ContainerName: "/root",
@ -78,6 +80,10 @@ func TestCheckIfIsSubcontainer(t *testing.T) {
ContainerName: "/root-completely-different-container", ContainerName: "/root-completely-different-container",
} }
if checkIfIsSubcontainer(rootRequest, sameContainerEvent) {
t.Errorf("should not have found %v to be a subcontainer of %v",
sameContainerEvent, rootRequest)
}
if !checkIfIsSubcontainer(myRequest, sameContainerEvent) { if !checkIfIsSubcontainer(myRequest, sameContainerEvent) {
t.Errorf("should have found %v and %v had the same container name", t.Errorf("should have found %v and %v had the same container name",
myRequest, sameContainerEvent) myRequest, sameContainerEvent)
@ -87,8 +93,13 @@ func TestCheckIfIsSubcontainer(t *testing.T) {
myRequest, subContainerEvent) myRequest, subContainerEvent)
} }
rootRequest.IncludeSubcontainers = true
myRequest.IncludeSubcontainers = true myRequest.IncludeSubcontainers = true
if !checkIfIsSubcontainer(rootRequest, sameContainerEvent) {
t.Errorf("should have found %v to be a subcontainer of %v",
sameContainerEvent.ContainerName, rootRequest.ContainerName)
}
if !checkIfIsSubcontainer(myRequest, sameContainerEvent) { if !checkIfIsSubcontainer(myRequest, sameContainerEvent) {
t.Errorf("should have found %v and %v had the same container", t.Errorf("should have found %v and %v had the same container",
myRequest.ContainerName, sameContainerEvent.ContainerName) myRequest.ContainerName, sameContainerEvent.ContainerName)