Revert "Move pkgState.mutex.RLock() outside else statement so that entry is RLocked in both the creation and reading cases."

tylerharter · tylerharter · commit 22ad4a28f3b3 · 2019-01-09T20:46:26.000-06:00
This reverts commit be48f9d.
diff --git a/worker/pip-manager/installManager.go b/worker/pip-manager/installManager.go
@@ -76,8 +76,8 @@ func (i *Installer) Install(pkgs []string) error {
 			// lock. We will also have to release reader locks on eviction of
 			// handlers/cache entries.
 			i.mutex.Unlock()
+			pkgState.mutex.RLock()
 		}
-		pkgState.mutex.RLock()
 	}
 
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ func (i *Installer) Install(pkgs []string) error {`
`76`	`76`	`// lock. We will also have to release reader locks on eviction of`
`77`	`77`	`// handlers/cache entries.`
`78`	`78`	`i.mutex.Unlock()`
	`79`	`+ pkgState.mutex.RLock()`
`79`	`80`	`}`
`80`		`- pkgState.mutex.RLock()`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`return nil`