Reduce probe cpu usage

experimental/demoprobe/main.go

@@ -27,10 +27,11 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
+	rp := xfer.NewReportPublisher(publisher)
 
 	rand.Seed(time.Now().UnixNano())
 	for range time.Tick(*publishInterval) {
-		if err := publisher.Publish(demoReport(*hostCount)); err != nil {
+		if err := rp.Publish(demoReport(*hostCount)); err != nil {
 			log.Print(err)
 		}
 	}
@@ -84,14 +85,14 @@ func demoReport(nodeCount int) report.Report {
 		)
 
 		// Endpoint topology
-		r.Endpoint = r.Endpoint.WithNode(srcPortID, report.MakeNode().WithMetadata(map[string]string{
+		r.Endpoint = r.Endpoint.AddNode(srcPortID, report.MakeNode().WithMetadata(map[string]string{
 			process.PID: "4000",
 			"name":      c.srcProc,
 			"domain":    "node-" + src,
 		}).WithEdge(dstPortID, report.EdgeMetadata{
 			MaxConnCountTCP: newu64(uint64(rand.Intn(100) + 10)),
 		}))
-		r.Endpoint = r.Endpoint.WithNode(dstPortID, report.MakeNode().WithMetadata(map[string]string{
+		r.Endpoint = r.Endpoint.AddNode(dstPortID, report.MakeNode().WithMetadata(map[string]string{
 			process.PID: "4000",
 			"name":      c.dstProc,
 			"domain":    "node-" + dst,
@@ -100,15 +101,15 @@ func demoReport(nodeCount int) report.Report {
 		}))
 
 		// Address topology
-		r.Address = r.Address.WithNode(srcAddressID, report.MakeNode().WithMetadata(map[string]string{
+		r.Address = r.Address.AddNode(srcAddressID, report.MakeNode().WithMetadata(map[string]string{
 			docker.Name: src,
 		}).WithAdjacent(dstAddressID))
-		r.Address = r.Address.WithNode(srcAddressID, report.MakeNode().WithMetadata(map[string]string{
+		r.Address = r.Address.AddNode(srcAddressID, report.MakeNode().WithMetadata(map[string]string{
 			docker.Name: dst,
 		}).WithAdjacent(srcAddressID))
 
 		// Host data
-		r.Host = r.Host.WithNode("hostX", report.MakeNodeWith(map[string]string{
+		r.Host = r.Host.AddNode("hostX", report.MakeNodeWith(map[string]string{
 			"ts":             time.Now().UTC().Format(time.RFC3339Nano),
 			"host_name":      "host-x",
 			"local_networks": localNet.String(),

experimental/fixprobe/main.go

@@ -39,7 +39,8 @@ func main() {
 		log.Fatal(err)
 	}
 
+	rp := xfer.NewReportPublisher(publisher)
 	for range time.Tick(*publishInterval) {
-		publisher.Publish(fixedReport)
+		rp.Publish(fixedReport)
 	}
 }

experimental/genreport/generate.go

@@ -64,14 +64,14 @@ func DemoReport(nodeCount int) report.Report {
 		)
 
 		// Endpoint topology
-		r.Endpoint = r.Endpoint.WithNode(srcPortID, report.MakeNode().WithMetadata(map[string]string{
+		r.Endpoint = r.Endpoint.AddNode(srcPortID, report.MakeNode().WithMetadata(map[string]string{
 			"pid":    "4000",
 			"name":   c.srcProc,
 			"domain": "node-" + src,
 		}).WithEdge(dstPortID, report.EdgeMetadata{
 			MaxConnCountTCP: newu64(uint64(rand.Intn(100) + 10)),
 		}))
-		r.Endpoint = r.Endpoint.WithNode(dstPortID, report.MakeNode().WithMetadata(map[string]string{
+		r.Endpoint = r.Endpoint.AddNode(dstPortID, report.MakeNode().WithMetadata(map[string]string{
 			"pid":    "4000",
 			"name":   c.dstProc,
 			"domain": "node-" + dst,
@@ -80,15 +80,15 @@ func DemoReport(nodeCount int) report.Report {
 		}))
 
 		// Address topology
-		r.Address = r.Address.WithNode(srcAddressID, report.MakeNode().WithMetadata(map[string]string{
+		r.Address = r.Address.AddNode(srcAddressID, report.MakeNode().WithMetadata(map[string]string{
 			"name": src,
 		}).WithAdjacent(dstAddressID))
-		r.Address = r.Address.WithNode(dstAddressID, report.MakeNode().WithMetadata(map[string]string{
+		r.Address = r.Address.AddNode(dstAddressID, report.MakeNode().WithMetadata(map[string]string{
 			"name": dst,
 		}).WithAdjacent(srcAddressID))
 
 		// Host data
-		r.Host = r.Host.WithNode("hostX", report.MakeNodeWith(map[string]string{
+		r.Host = r.Host.AddNode("hostX", report.MakeNodeWith(map[string]string{
 			"ts":             time.Now().UTC().Format(time.RFC3339Nano),
 			"host_name":      "host-x",
 			"local_networks": localNet.String(),

probe/endpoint/conntrack.go

@@ -105,7 +105,7 @@ var ConntrackModulePresent = func() bool {
 
 // NB this is not re-entrant!
 func (c *Conntracker) run(args ...string) {
-	args = append([]string{"-E", "-o", "xml"}, args...)
+	args = append([]string{"-E", "-o", "xml", "-p", "tcp"}, args...)
 	cmd := exec.Command("conntrack", args...)
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {

probe/endpoint/reporter.go

@@ -178,8 +178,8 @@ func (r *Reporter) addConnection(rpt *report.Report, localAddr, remoteAddr strin
 			})
 		}
 
-		rpt.Address = rpt.Address.WithNode(localAddressNodeID, localNode)
-		rpt.Address = rpt.Address.WithNode(remoteAddressNodeID, remoteNode)
+		rpt.Address = rpt.Address.AddNode(localAddressNodeID, localNode)
+		rpt.Address = rpt.Address.AddNode(remoteAddressNodeID, remoteNode)
 	}
 
 	// Update endpoint topology
@@ -225,8 +225,8 @@ func (r *Reporter) addConnection(rpt *report.Report, localAddr, remoteAddr strin
 		if extraRemoteNode != nil {
 			remoteNode = remoteNode.Merge(*extraRemoteNode)
 		}
-		rpt.Endpoint = rpt.Endpoint.WithNode(localEndpointNodeID, localNode)
-		rpt.Endpoint = rpt.Endpoint.WithNode(remoteEndpointNodeID, remoteNode)
+		rpt.Endpoint = rpt.Endpoint.AddNode(localEndpointNodeID, localNode)
+		rpt.Endpoint = rpt.Endpoint.AddNode(remoteEndpointNodeID, remoteNode)
 	}
 }
 

probe/main.go

@@ -113,6 +113,7 @@ func main() {
 	var (
 		endpointReporter = endpoint.NewReporter(hostID, hostName, *spyProcs, *useConntrack)
 		processCache     = process.NewCachingWalker(process.NewWalker(*procRoot))
+		tickers          = []Ticker{processCache}
 		reporters        = []Reporter{
 			endpointReporter,
 			host.NewReporter(hostID, hostName, localNets),
@@ -142,6 +143,7 @@ func main() {
 		if err != nil {
 			log.Fatalf("failed to start Weave tagger: %v", err)
 		}
+		tickers = append(tickers, weave)
 		taggers = append(taggers, weave)
 		reporters = append(reporters, weave)
 	}
@@ -173,31 +175,35 @@ func main() {
 			pubTick = time.Tick(*publishInterval)
 			spyTick = time.Tick(*spyInterval)
 			r       = report.MakeReport()
+			p       = xfer.NewReportPublisher(publishers)
 		)
 
 		for {
 			select {
 			case <-pubTick:
 				publishTicks.WithLabelValues().Add(1)
 				r.Window = *publishInterval
-				if err := publishers.Publish(r); err != nil {
+				if err := p.Publish(r); err != nil {
 					log.Printf("publish: %v", err)
 				}
 				r = report.MakeReport()
 
 			case <-spyTick:
-				if err := processCache.Update(); err != nil {
-					log.Printf("error reading processes: %v", err)
-				}
-				for _, reporter := range reporters {
-					newReport, err := reporter.Report()
-					if err != nil {
-						log.Printf("error generating report: %v", err)
+				start := time.Now()
+
+				for _, ticker := range tickers {
+					if err := ticker.Tick(); err != nil {
+						log.Printf("error doing ticker: %v", err)
 					}
-					r = r.Merge(newReport)
 				}
+
+				r = r.Merge(doReport(reporters))
 				r = Apply(r, taggers)
 
+				if took := time.Since(start); took > *spyInterval {
+					log.Printf("report generation took too long (%s)", took)
+				}
+
 			case <-quit:
 				return
 			}
@@ -206,6 +212,26 @@ func main() {
 	log.Printf("%s", <-interrupt())
 }
 
+func doReport(reporters []Reporter) report.Report {
+	reports := make(chan report.Report, len(reporters))
+	for _, rep := range reporters {
+		go func(rep Reporter) {
+			newReport, err := rep.Report()
+			if err != nil {
+				log.Printf("error generating report: %v", err)
+				newReport = report.MakeReport() // empty is OK to merge
+			}
+			reports <- newReport
+		}(rep)
+	}
+
+	result := report.MakeReport()
+	for i := 0; i < cap(reports); i++ {
+		result = result.Merge(<-reports)
+	}
+	return result
+}
+
 func interrupt() chan os.Signal {
 	c := make(chan os.Signal)
 	signal.Notify(c, syscall.SIGINT, syscall.SIGTERM)

probe/overlay/weave.go

@@ -10,6 +10,7 @@ import (
 	"net/url"
 	"regexp"
 	"strings"
+	"sync"
 
 	"github.com/weaveworks/scope/common/exec"
 	"github.com/weaveworks/scope/probe/docker"
@@ -43,6 +44,9 @@ var ipMatch = regexp.MustCompile(`([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3
 type Weave struct {
 	url    string
 	hostID string
+
+	mtx    sync.RWMutex
+	status weaveStatus
 }
 
 type weaveStatus struct {
@@ -75,24 +79,32 @@ func NewWeave(hostID, weaveRouterAddress string) (*Weave, error) {
 	}, nil
 }
 
-func (w Weave) update() (weaveStatus, error) {
-	var result weaveStatus
+// Tick implements Ticker
+func (w *Weave) Tick() error {
 	req, err := http.NewRequest("GET", w.url, nil)
 	if err != nil {
-		return result, err
+		return err
 	}
 	req.Header.Add("Accept", "application/json")
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		return result, err
+		return err
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		return result, fmt.Errorf("Weave Tagger: got %d", resp.StatusCode)
+		return fmt.Errorf("Weave Tagger: got %d", resp.StatusCode)
+	}
+
+	var result weaveStatus
+	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
+		return err
 	}
 
-	return result, json.NewDecoder(resp.Body).Decode(&result)
+	w.mtx.Lock()
+	defer w.mtx.Unlock()
+	w.status = result
+	return nil
 }
 
 type psEntry struct {
@@ -101,7 +113,7 @@ type psEntry struct {
 	ips               []string
 }
 
-func (w Weave) ps() ([]psEntry, error) {
+func (w *Weave) ps() ([]psEntry, error) {
 	var result []psEntry
 	cmd := exec.Command("weave", "--local", "ps")
 	out, err := cmd.StdoutPipe()
@@ -132,30 +144,13 @@ func (w Weave) ps() ([]psEntry, error) {
 	return result, scanner.Err()
 }
 
-func (w Weave) tagContainer(r report.Report, containerIDPrefix, macAddress string, ips []string) {
-	for nodeid, nmd := range r.Container.Nodes {
-		idPrefix := nmd.Metadata[docker.ContainerID][:12]
-		if idPrefix != containerIDPrefix {
-			continue
-		}
-
-		existingIPs := report.MakeIDList(docker.ExtractContainerIPs(nmd)...)
-		existingIPs = existingIPs.Add(ips...)
-		nmd.Metadata[docker.ContainerIPs] = strings.Join(existingIPs, " ")
-		nmd.Metadata[WeaveMACAddress] = macAddress
-		r.Container.Nodes[nodeid] = nmd
-		break
-	}
-}
-
 // Tag implements Tagger.
-func (w Weave) Tag(r report.Report) (report.Report, error) {
-	status, err := w.update()
-	if err != nil {
-		return r, nil
-	}
+func (w *Weave) Tag(r report.Report) (report.Report, error) {
+	w.mtx.RLock()
+	defer w.mtx.RUnlock()
 
-	for _, entry := range status.DNS.Entries {
+	// Put information from weaveDNS on the container nodes
+	for _, entry := range w.status.DNS.Entries {
 		if entry.Tombstone > 0 {
 			continue
 		}
@@ -167,28 +162,39 @@ func (w Weave) Tag(r report.Report) (report.Report, error) {
 		hostnames := report.IDList(strings.Fields(node.Metadata[WeaveDNSHostname]))
 		hostnames = hostnames.Add(strings.TrimSuffix(entry.Hostname, "."))
 		node.Metadata[WeaveDNSHostname] = strings.Join(hostnames, " ")
-		r.Container.Nodes[nodeID] = node
 	}
 
+	// Put information from weave ps on the container nodes
 	psEntries, err := w.ps()
 	if err != nil {
 		return r, nil
 	}
+	containersByPrefix := map[string]report.Node{}
+	for _, node := range r.Container.Nodes {
+		prefix := node.Metadata[docker.ContainerID][:12]
+		containersByPrefix[prefix] = node
+	}
 	for _, e := range psEntries {
-		w.tagContainer(r, e.containerIDPrefix, e.macAddress, e.ips)
+		node, ok := containersByPrefix[e.containerIDPrefix]
+		if !ok {
+			continue
+		}
+
+		existingIPs := report.MakeIDList(docker.ExtractContainerIPs(node)...)
+		existingIPs = existingIPs.Add(e.ips...)
+		node.Metadata[docker.ContainerIPs] = strings.Join(existingIPs, " ")
+		node.Metadata[WeaveMACAddress] = e.macAddress
 	}
 	return r, nil
 }
 
 // Report implements Reporter.
-func (w Weave) Report() (report.Report, error) {
-	r := report.MakeReport()
-	status, err := w.update()
-	if err != nil {
-		return r, err
-	}
+func (w *Weave) Report() (report.Report, error) {
+	w.mtx.RLock()
+	defer w.mtx.RUnlock()
 
-	for _, peer := range status.Router.Peers {
+	r := report.MakeReport()
+	for _, peer := range w.status.Router.Peers {
 		r.Overlay.Nodes[report.MakeOverlayNodeID(peer.Name)] = report.MakeNodeWith(map[string]string{
 			WeavePeerName:     peer.Name,
 			WeavePeerNickName: peer.NickName,

probe/overlay/weave_test.go

@@ -30,6 +30,8 @@ func TestWeaveTaggerOverlayTopology(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	w.Tick()
+
 	{
 		have, err := w.Report()
 		if err != nil {

probe/process/walker.go

@@ -39,8 +39,8 @@ func (c *CachingWalker) Walk(f func(Process)) error {
 	return nil
 }
 
-// Update updates cached copy of process list
-func (c *CachingWalker) Update() error {
+// Tick updates cached copy of process list
+func (c *CachingWalker) Tick() error {
 	newCache := []Process{}
 	err := c.source.Walk(func(p Process) {
 		newCache = append(newCache, p)