Merge pull request #12 from cnrancher/release/2.4-ent

[Backport] Fix map concurrent read/write
This commit is contained in:
Denise 2020-11-18 12:09:14 -08:00 committed by GitHub
commit 36fcb689bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -126,8 +126,13 @@ func (s *WatchSession) watch(conn *websocket.Conn, resp chan types.APIEvent) err
if sub.Stop { if sub.Stop {
s.stop(sub.ResourceType, resp) s.stop(sub.ResourceType, resp)
} else if _, ok := s.watchers[sub.ResourceType]; !ok { } else {
s.add(sub.ResourceType, sub.ResourceVersion, resp) s.Lock()
_, ok := s.watchers[sub.ResourceType]
s.Unlock()
if !ok {
s.add(sub.ResourceType, sub.ResourceVersion, resp)
}
} }
} }
} }