Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add mutex to gnmi lookup map (#11006) #11008

Merged
merged 1 commit into from
Apr 22, 2022
Merged

fix: add mutex to gnmi lookup map (#11006) #11008

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion plugins/inputs/gnmi/gnmi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ type GNMI struct {
cancel context.CancelFunc
wg sync.WaitGroup
// Lookup/device+name/key/value
lookup map[string]map[string]map[string]interface{}
lookup map[string]map[string]map[string]interface{}
lookupMutex sync.Mutex

Log telegraf.Logger
}
Expand Down Expand Up @@ -88,7 +89,9 @@ func (c *GNMI) Start(acc telegraf.Accumulator) error {
var request *gnmiLib.SubscribeRequest
c.acc = acc
ctx, c.cancel = context.WithCancel(context.Background())
c.lookupMutex.Lock()
c.lookup = make(map[string]map[string]map[string]interface{})
c.lookupMutex.Unlock()

// Validate configuration
if request, err = c.newSubscribeRequest(); err != nil {
Expand Down Expand Up @@ -142,7 +145,9 @@ func (c *GNMI) Start(acc telegraf.Accumulator) error {

if subscription.TagOnly {
// Create the top-level lookup for this tag
c.lookupMutex.Lock()
c.lookup[name] = make(map[string]map[string]interface{})
c.lookupMutex.Unlock()
}
}
for alias, encodingPath := range c.Aliases {
Expand Down Expand Up @@ -310,6 +315,7 @@ func (c *GNMI) handleSubscribeResponseUpdate(address string, response *gnmiLib.S

// Update tag lookups and discard rest of update
subscriptionKey := tags["source"] + "/" + tags["name"]
c.lookupMutex.Lock()
if _, ok := c.lookup[name]; ok {
// We are subscribed to this, so add the fields to the lookup-table
if _, ok := c.lookup[name][subscriptionKey]; !ok {
Expand All @@ -318,6 +324,7 @@ func (c *GNMI) handleSubscribeResponseUpdate(address string, response *gnmiLib.S
for k, v := range fields {
c.lookup[name][subscriptionKey][path.Base(k)] = v
}
c.lookupMutex.Unlock()
// Do not process the data further as we only subscribed here for the lookup table
continue
}
Expand All @@ -330,6 +337,7 @@ func (c *GNMI) handleSubscribeResponseUpdate(address string, response *gnmiLib.S
}
}
}
c.lookupMutex.Unlock()

// Group metrics
for k, v := range fields {
Expand Down