Merge pull request agola-io#58 from sgotti/readdb_fix_deadlock

readdb: fix deadlock in Run method
tulliobotti64 · Jul 23, 2019 · f268eca · f268eca
2 parents 5973505 + 6d541cd
commit f268eca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/internal/services/configstore/readdb/readdb.go b/internal/services/configstore/readdb/readdb.go
@@ -424,7 +424,6 @@ func (r *ReadDB) Run(ctx context.Context) error {
 	}
 	r.SetInitialized(true)
 
-	errCh := make(chan error)
 	for {
 		for {
 			initialized := r.IsInitialized()
@@ -441,6 +440,7 @@ func (r *ReadDB) Run(ctx context.Context) error {
 			time.Sleep(1 * time.Second)
 		}
 
+		errCh := make(chan error, 1)
 		ctx, cancel := context.WithCancel(ctx)
 		wg := &sync.WaitGroup{}
 

diff --git a/internal/services/runservice/readdb/readdb.go b/internal/services/runservice/readdb/readdb.go
@@ -274,7 +274,6 @@ func (r *ReadDB) Run(ctx context.Context) error {
 	}
 	r.SetInitialized(true)
 
-	errCh := make(chan error)
 	for {
 		for {
 			initialized := r.IsInitialized()
@@ -291,6 +290,7 @@ func (r *ReadDB) Run(ctx context.Context) error {
 			time.Sleep(1 * time.Second)
 		}
 
+		errCh := make(chan error, 2)
 		ctx, cancel := context.WithCancel(ctx)
 		wg := &sync.WaitGroup{}