Add locks for populateCache which is racy and panics

in a concurrent environment
kopwei · Oct 25, 2016 · 19b882b · 19b882b
1 parent f8b106b
commit 19b882b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/ovsclient.go b/ovsclient.go
@@ -77,6 +77,7 @@ var intfUpdateLock sync.RWMutex
 var bridgeCacheUpdateLock sync.RWMutex
 var portCacheUpdateLock sync.RWMutex
 var intfCacheUpdateLock sync.RWMutex
+var populateCacheLock sync.RWMutex
 
 // GetOVSClient is used for
 func GetOVSClient(contype, endpoint string) (OvsClient, error) {
@@ -242,6 +243,8 @@ func (client *ovsClient) removeOvsObjCacheByRow(objtype, uuid string) error {
 }
 
 func populateCache(updates libovsdb.TableUpdates) (err error) {
+	populateCacheLock.Lock()
+	defer populateCacheLock.Unlock()
 	for table, tableUpdate := range updates.Updates {
 		if _, ok := cache[table]; !ok {
 			cache[table] = make(map[string]libovsdb.Row)