Merge pull request #227 from jfontan/fix/race-condition-repoiter

Check for already closed rowRepoIter

Author: jfontan

repository_pool.go

@@ -173,6 +173,9 @@ type rowRepoIter struct {
 	err   error
 	repos chan *Repository
 	rows  chan sql.Row
+
+	doneMutex  sync.Mutex
+	doneClosed bool
 }
 
 // NewRowRepoIter initializes a new repository iterator.
@@ -233,6 +236,16 @@ func (i *rowRepoIter) setError(err error) {
 	i.err = err
 }
 
+func closeIter(i *rowRepoIter) {
+	i.doneMutex.Lock()
+	defer i.doneMutex.Unlock()
+
+	if !i.doneClosed {
+		close(i.done)
+		i.doneClosed = true
+	}
+}
+
 func (i *rowRepoIter) fillRepoChannel() {
 	defer close(i.repos)
 
@@ -242,7 +255,7 @@ func (i *rowRepoIter) fillRepoChannel() {
 			return
 
 		case <-i.ctx.Done():
-			close(i.done)
+			closeIter(i)
 			return
 
 		default:
@@ -256,7 +269,7 @@ func (i *rowRepoIter) fillRepoChannel() {
 
 				case <-i.ctx.Done():
 					i.setError(ErrSessionCanceled.New())
-					close(i.done)
+					closeIter(i)
 					return
 
 				case i.repos <- repo:
@@ -268,7 +281,7 @@ func (i *rowRepoIter) fillRepoChannel() {
 				return
 
 			default:
-				close(i.done)
+				closeIter(i)
 				i.setError(err)
 				return
 			}
@@ -288,7 +301,7 @@ func (i *rowRepoIter) rowReader(num int) {
 				return
 			default:
 				i.setError(err)
-				close(i.done)
+				closeIter(i)
 				continue
 			}
 		}
@@ -322,7 +335,7 @@ func (i *rowRepoIter) rowReader(num int) {
 				default:
 					iter.Close()
 					i.setError(err)
-					close(i.done)
+					closeIter(i)
 					return
 				}
 			}