CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory leak in couchbase input (#9544)

This commit is contained in:
Alexander Krantz 2021-09-07 14:25:30 -07:00 committed by GitHub
parent 147e3d1389
commit ba1484cb75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/inputs/couchbase/couchbase.go
View File

@ -53,7 +53,7 @@ func (cb *Couchbase) Description() string {
// Returns one of the errors encountered while gathering stats (if any). // Returns one of the errors encountered while gathering stats (if any).
func (cb *Couchbase) Gather(acc telegraf.Accumulator) error { func (cb *Couchbase) Gather(acc telegraf.Accumulator) error {
if len(cb.Servers) == 0 { if len(cb.Servers) == 0 {
return cb.gatherServer(acc, "http://localhost:8091/", nil) return cb.gatherServer(acc, "http://localhost:8091/")
} }
var wg sync.WaitGroup var wg sync.WaitGroup
@ -61,7 +61,7 @@ func (cb *Couchbase) Gather(acc telegraf.Accumulator) error {
wg.Add(1) wg.Add(1)
go func(serv string) { go func(serv string) {
defer wg.Done() defer wg.Done()
acc.AddError(cb.gatherServer(acc, serv, nil)) acc.AddError(cb.gatherServer(acc, serv))
}(serv) }(serv)
} }
@ -70,26 +70,26 @@ func (cb *Couchbase) Gather(acc telegraf.Accumulator) error {
return nil return nil
} }
func (cb *Couchbase) gatherServer(acc telegraf.Accumulator, addr string, pool *couchbaseClient.Pool) error { func (cb *Couchbase) gatherServer(acc telegraf.Accumulator, addr string) error {
if pool == nil { escapedAddr := regexpURI.ReplaceAllString(addr, "${1}")
client, err := couchbaseClient.Connect(addr)
if err != nil {
return err
}
// `default` is the only possible pool name. It's a client, err := couchbaseClient.Connect(addr)
// placeholder for a possible future Couchbase feature. See if err != nil {
// http://stackoverflow.com/a/16990911/17498. return err
p, err := client.GetPool("default")
if err != nil {
return err
}
pool = &p
} }
// `default` is the only possible pool name. It's a
// placeholder for a possible future Couchbase feature. See
// http://stackoverflow.com/a/16990911/17498.
pool, err := client.GetPool("default")
if err != nil {
return err
}
defer pool.Close()
for i := 0; i < len(pool.Nodes); i++ { for i := 0; i < len(pool.Nodes); i++ {
node := pool.Nodes[i] node := pool.Nodes[i]
tags := map[string]string{"cluster": regexpURI.ReplaceAllString(addr, "${1}"), "hostname": node.Hostname} tags := map[string]string{"cluster": escapedAddr, "hostname": node.Hostname}
fields := make(map[string]interface{}) fields := make(map[string]interface{})
fields["memory_free"] = node.MemoryFree fields["memory_free"] = node.MemoryFree
fields["memory_total"] = node.MemoryTotal fields["memory_total"] = node.MemoryTotal
@ -97,7 +97,7 @@ func (cb *Couchbase) gatherServer(acc telegraf.Accumulator, addr string, pool *c
} }
for bucketName := range pool.BucketMap { for bucketName := range pool.BucketMap {
tags := map[string]string{"cluster": regexpURI.ReplaceAllString(addr, "${1}"), "bucket": bucketName} tags := map[string]string{"cluster": escapedAddr, "bucket": bucketName}
bs := pool.BucketMap[bucketName].BasicStats bs := pool.BucketMap[bucketName].BasicStats
fields := make(map[string]interface{}) fields := make(map[string]interface{})
cb.addBucketField(fields, "quota_percent_used", bs["quotaPercentUsed"]) cb.addBucketField(fields, "quota_percent_used", bs["quotaPercentUsed"])

40
plugins/inputs/couchbase/couchbase_test.go
View File

File diff suppressed because one or more lines are too long