Merge pull request #581 from jojimt/k8fix

jojimt · web-flow · commit f3bc379961f2 · 2016-10-18T16:30:22.000-07:00
Fix concurrent map error
diff --git a/mgmtfn/k8splugin/kubeClient.go b/mgmtfn/k8splugin/kubeClient.go
@@ -27,6 +27,7 @@ import (
 	"golang.org/x/net/context/ctxhttp"
 	"io/ioutil"
 	"net/http"
+	"sync"
 )
 
 const (
@@ -72,9 +73,10 @@ type watchSvcEpStatus struct {
 }
 
 type podInfo struct {
-	nameSpace string
-	name      string
-	labels    map[string]string
+	nameSpace   string
+	name        string
+	labels      map[string]string
+	labelsMutex sync.Mutex
 }
 
 // NewAPIClient creates an instance of the k8s api client
@@ -165,6 +167,8 @@ func (c *APIClient) fetchPodLabels(ns, name string) error {
 	}
 
 	p := &c.podCache
+	p.labelsMutex.Lock()
+	defer p.labelsMutex.Unlock()
 	p.setDefaults(ns, name)
 
 	meta := m.(map[string]interface{})

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ import (`
`27`	`27`	`"golang.org/x/net/context/ctxhttp"`
`28`	`28`	`"io/ioutil"`
`29`	`29`	`"net/http"`
	`30`	`+ "sync"`
`30`	`31`	`)`
`31`	`32`
`32`	`33`	`const (`
`@@ -72,9 +73,10 @@ type watchSvcEpStatus struct {`
`72`	`73`	`}`
`73`	`74`
`74`	`75`	`type podInfo struct {`
`75`		`- nameSpace string`
`76`		`- name string`
`77`		`- labels map[string]string`
	`76`	`+ nameSpace string`
	`77`	`+ name string`
	`78`	`+ labels map[string]string`
	`79`	`+ labelsMutex sync.Mutex`
`78`	`80`	`}`
`79`	`81`
`80`	`82`	`// NewAPIClient creates an instance of the k8s api client`
`@@ -165,6 +167,8 @@ func (c *APIClient) fetchPodLabels(ns, name string) error {`
`165`	`167`	`}`
`166`	`168`
`167`	`169`	`p := &c.podCache`
	`170`	`+ p.labelsMutex.Lock()`
	`171`	`+ defer p.labelsMutex.Unlock()`
`168`	`172`	`p.setDefaults(ns, name)`
`169`	`173`
`170`	`174`	`meta := m.(map[string]interface{})`