瀏覽代碼

Lock agent access in addDriverWatches

Signed-off-by: Alessandro Boch <aboch@docker.com>
Alessandro Boch 9 年之前
父節點
當前提交
8653b72786
共有 1 個文件被更改,包括 5 次插入1 次删除
  1. 5 1
      libnetwork/agent.go

+ 5 - 1
libnetwork/agent.go

@@ -468,8 +468,12 @@ func (n *network) addDriverWatches() {
 
 	c := n.getController()
 	for _, tableName := range n.driverTables {
-		ch, cancel := c.agent.networkDB.Watch(tableName, n.ID(), "")
 		c.Lock()
+		if c.agent == nil {
+			c.Unlock()
+			return
+		}
+		ch, cancel := c.agent.networkDB.Watch(tableName, n.ID(), "")
 		c.agent.driverCancelFuncs[n.ID()] = append(c.agent.driverCancelFuncs[n.ID()], cancel)
 		c.Unlock()