vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-07-16 12:08:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #688 from smira/686-race-fix

Browse Source 
Fix race in API related to `LoadComplete()`
This commit is contained in:
Andrey Smirnov
2017-12-13 15:49:37 +03:00
committed by GitHub
parent 9cb2a302f8 43ddcd27cb
commit 1aa88701fb
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/graph.go
+8 -8
View File
@@ -24,14 +24,14 @@ func apiGraph(c *gin.Context) {
factory := context.CollectionFactory() factory := context.CollectionFactory()
factory.RemoteRepoCollection().RLock() factory.RemoteRepoCollection().Lock()
defer factory.RemoteRepoCollection().RUnlock() defer factory.RemoteRepoCollection().Unlock()
factory.LocalRepoCollection().RLock() factory.LocalRepoCollection().Lock()
defer factory.LocalRepoCollection().RUnlock() defer factory.LocalRepoCollection().Unlock()
factory.SnapshotCollection().RLock() factory.SnapshotCollection().Lock()
defer factory.SnapshotCollection().RUnlock() defer factory.SnapshotCollection().Unlock()
factory.PublishedRepoCollection().RLock() factory.PublishedRepoCollection().Lock()
defer factory.PublishedRepoCollection().RUnlock() defer factory.PublishedRepoCollection().Unlock()
graph, err := deb.BuildGraph(factory, layout) graph, err := deb.BuildGraph(factory, layout)
if err != nil { if err != nil {
api/publish.go
+12 -12
View File
@@ -60,8 +60,8 @@ func apiPublishList(c *gin.Context) {
defer snapshotCollection.RUnlock() defer snapshotCollection.RUnlock()
collection := context.CollectionFactory().PublishedRepoCollection() collection := context.CollectionFactory().PublishedRepoCollection()
collection.RLock() collection.Lock()
defer collection.RUnlock() defer collection.Unlock()
result := make([]*deb.PublishedRepo, 0, collection.Len()) result := make([]*deb.PublishedRepo, 0, collection.Len())
@@ -128,8 +128,8 @@ func apiPublishRepoOrSnapshot(c *gin.Context) {
var snapshot *deb.Snapshot var snapshot *deb.Snapshot
snapshotCollection := context.CollectionFactory().SnapshotCollection() snapshotCollection := context.CollectionFactory().SnapshotCollection()
snapshotCollection.RLock() snapshotCollection.Lock()
defer snapshotCollection.RUnlock() defer snapshotCollection.Unlock()
for _, source := range b.Sources { for _, source := range b.Sources {
components = append(components, source.Component) components = append(components, source.Component)
@@ -152,8 +152,8 @@ func apiPublishRepoOrSnapshot(c *gin.Context) {
var localRepo *deb.LocalRepo var localRepo *deb.LocalRepo
localCollection := context.CollectionFactory().LocalRepoCollection() localCollection := context.CollectionFactory().LocalRepoCollection()
localCollection.RLock() localCollection.Lock()
defer localCollection.RUnlock() defer localCollection.Unlock()
for _, source := range b.Sources { for _, source := range b.Sources {
components = append(components, source.Component) components = append(components, source.Component)
@@ -253,12 +253,12 @@ func apiPublishUpdateSwitch(c *gin.Context) {
// published.LoadComplete would touch local repo collection // published.LoadComplete would touch local repo collection
localRepoCollection := context.CollectionFactory().LocalRepoCollection() localRepoCollection := context.CollectionFactory().LocalRepoCollection()
localRepoCollection.RLock() localRepoCollection.Lock()
defer localRepoCollection.RUnlock() defer localRepoCollection.Unlock()
snapshotCollection := context.CollectionFactory().SnapshotCollection() snapshotCollection := context.CollectionFactory().SnapshotCollection()
snapshotCollection.RLock() snapshotCollection.Lock()
defer snapshotCollection.RUnlock() defer snapshotCollection.Unlock()
collection := context.CollectionFactory().PublishedRepoCollection() collection := context.CollectionFactory().PublishedRepoCollection()
collection.Lock() collection.Lock()
@@ -357,8 +357,8 @@ func apiPublishDrop(c *gin.Context) {
// published.LoadComplete would touch local repo collection // published.LoadComplete would touch local repo collection
localRepoCollection := context.CollectionFactory().LocalRepoCollection() localRepoCollection := context.CollectionFactory().LocalRepoCollection()
localRepoCollection.RLock() localRepoCollection.Lock()
defer localRepoCollection.RUnlock() defer localRepoCollection.Unlock()
collection := context.CollectionFactory().PublishedRepoCollection() collection := context.CollectionFactory().PublishedRepoCollection()
collection.Lock() collection.Lock()
api/repos.go
+2 -2
View File
@@ -162,8 +162,8 @@ func apiReposDrop(c *gin.Context) {
// GET /api/repos/:name/packages // GET /api/repos/:name/packages
func apiReposPackagesShow(c *gin.Context) { func apiReposPackagesShow(c *gin.Context) {
collection := context.CollectionFactory().LocalRepoCollection() collection := context.CollectionFactory().LocalRepoCollection()
collection.RLock() collection.Lock()
defer collection.RUnlock() defer collection.Unlock()
repo, err := collection.ByName(c.Params.ByName("name")) repo, err := collection.ByName(c.Params.ByName("name"))
if err != nil { if err != nil {
api/snapshot.go
+10 -10
View File
@@ -47,8 +47,8 @@ func apiSnapshotsCreateFromMirror(c *gin.Context) {
} }
collection := context.CollectionFactory().RemoteRepoCollection() collection := context.CollectionFactory().RemoteRepoCollection()
collection.RLock() collection.Lock()
defer collection.RUnlock() defer collection.Unlock()
snapshotCollection := context.CollectionFactory().SnapshotCollection() snapshotCollection := context.CollectionFactory().SnapshotCollection()
snapshotCollection.Lock() snapshotCollection.Lock()
@@ -186,8 +186,8 @@ func apiSnapshotsCreateFromRepository(c *gin.Context) {
} }
collection := context.CollectionFactory().LocalRepoCollection() collection := context.CollectionFactory().LocalRepoCollection()
collection.RLock() collection.Lock()
defer collection.RUnlock() defer collection.Unlock()
snapshotCollection := context.CollectionFactory().SnapshotCollection() snapshotCollection := context.CollectionFactory().SnapshotCollection()
snapshotCollection.Lock() snapshotCollection.Lock()
@@ -276,8 +276,8 @@ func apiSnapshotsUpdate(c *gin.Context) {
// GET /api/snapshots/:name // GET /api/snapshots/:name
func apiSnapshotsShow(c *gin.Context) { func apiSnapshotsShow(c *gin.Context) {
collection := context.CollectionFactory().SnapshotCollection() collection := context.CollectionFactory().SnapshotCollection()
collection.RLock() collection.Lock()
defer collection.RUnlock() defer collection.Unlock()
snapshot, err := collection.ByName(c.Params.ByName("name")) snapshot, err := collection.ByName(c.Params.ByName("name"))
if err != nil { if err != nil {
@@ -342,8 +342,8 @@ func apiSnapshotsDiff(c *gin.Context) {
onlyMatching := c.Request.URL.Query().Get("onlyMatching") == "1" onlyMatching := c.Request.URL.Query().Get("onlyMatching") == "1"
collection := context.CollectionFactory().SnapshotCollection() collection := context.CollectionFactory().SnapshotCollection()
collection.RLock() collection.Lock()
defer collection.RUnlock() defer collection.Unlock()
snapshotA, err := collection.ByName(c.Params.ByName("name")) snapshotA, err := collection.ByName(c.Params.ByName("name"))
if err != nil { if err != nil {
@@ -392,8 +392,8 @@ func apiSnapshotsDiff(c *gin.Context) {
// GET /api/snapshots/:name/packages // GET /api/snapshots/:name/packages
func apiSnapshotsSearchPackages(c *gin.Context) { func apiSnapshotsSearchPackages(c *gin.Context) {
collection := context.CollectionFactory().SnapshotCollection() collection := context.CollectionFactory().SnapshotCollection()
collection.RLock() collection.Lock()
defer collection.RUnlock() defer collection.Unlock()
snapshot, err := collection.ByName(c.Params.ByName("name")) snapshot, err := collection.ByName(c.Params.ByName("name"))
if err != nil { if err != nil {