Fix data races in galley/pkg/config/source (istio#16719)

* Fix races in code. * fix lint error.
mfilipiak-ccg · Sep 3, 2019 · f10e25f · f10e25f
1 parent 3188d1a
commit f10e25f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/galley/pkg/config/source/kube/fs/source.go b/galley/pkg/config/source/kube/fs/source.go
@@ -72,7 +72,8 @@ func (s *source) Start() {
 	if s.done != nil {
 		return
 	}
-	s.done = make(chan struct{})
+	done := make(chan struct{})
+	s.done = done
 
 	c := make(chan appsignals.Signal, 1)
 	appsignals.Watch(c)
@@ -86,7 +87,7 @@ func (s *source) Start() {
 					scope.Source.Infof("[%s] Triggering reload in response to: %v", s.name, trigger.Source)
 					s.reload()
 				}
-			case <-s.done:
+			case <-done:
 				return
 			}
 		}

diff --git a/galley/pkg/config/testing/fixtures/expect.go b/galley/pkg/config/testing/fixtures/expect.go
@@ -47,7 +47,7 @@ func ExpectFilter(t *testing.T, acc *Accumulator, fn FilterFn, expected ...event
 	g := gomega.NewGomegaWithT(t)
 
 	wrapFn := func() []event.Event {
-		e := acc.events
+		e := acc.Events()
 		if fn != nil {
 			e = fn(e)
 		}