Fix data race accessing watched containers (#5310)

(cherry picked from commit f769d20)
elastic · Oct 4, 2017 · b13df81 · b13df81
1 parent 083d772
commit b13df81
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -30,6 +30,8 @@ https://github.com/elastic/beats/compare/v6.0.0-rc1...master[Check the HEAD diff
 
 *Affecting all Beats*
 
+- Fix data race accessing watched containers. {issue}5147[5147]
+
 *Auditbeat*
 
 *Filebeat*

diff --git a/libbeat/processors/add_docker_metadata/watcher.go b/libbeat/processors/add_docker_metadata/watcher.go
@@ -108,10 +108,11 @@ func NewWatcherWithClient(client Client, cleanupTimeout time.Duration) (*watcher
 func (w *watcher) Container(ID string) *Container {
 	w.RLock()
 	container := w.containers[ID]
+	_, ok := w.deleted[ID]
 	w.RUnlock()
 
 	// Update last access time if it's deleted
-	if _, ok := w.deleted[ID]; ok {
+	if ok {
 		w.Lock()
 		w.deleted[ID] = time.Now()
 		w.Unlock()