Skip to content

Commit b08a916

Browse files
committed
use globallock lock
1 parent 72c381f commit b08a916

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

routers/api/packages/maven/maven.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ func UploadPackageFile(ctx *context.Context) {
247247
packageName := params.GroupID + "-" + params.ArtifactID
248248

249249
// for the same package, only one upload at a time
250-
ctx, releaser, err := globallock.Lock(ctx, mavenPkgNameKey(packageName))
250+
stdCtx, releaser, err := globallock.Lock(ctx, mavenPkgNameKey(packageName))
251251
if err != nil {
252252
apiError(ctx, http.StatusInternalServerError, err)
253253
return
@@ -276,7 +276,7 @@ func UploadPackageFile(ctx *context.Context) {
276276

277277
// Do not upload checksum files but compare the hashes.
278278
if isChecksumExtension(ext) {
279-
pv, err := packages_model.GetVersionByNameAndVersion(ctx, pvci.Owner.ID, pvci.PackageType, pvci.Name, pvci.Version)
279+
pv, err := packages_model.GetVersionByNameAndVersion(stdCtx, pvci.Owner.ID, pvci.PackageType, pvci.Name, pvci.Version)
280280
if err != nil {
281281
if err == packages_model.ErrPackageNotExist {
282282
apiError(ctx, http.StatusNotFound, err)
@@ -285,7 +285,7 @@ func UploadPackageFile(ctx *context.Context) {
285285
apiError(ctx, http.StatusInternalServerError, err)
286286
return
287287
}
288-
pf, err := packages_model.GetFileForVersionByName(ctx, pv.ID, params.Filename[:len(params.Filename)-len(ext)], packages_model.EmptyFileKey)
288+
pf, err := packages_model.GetFileForVersionByName(stdCtx, pv.ID, params.Filename[:len(params.Filename)-len(ext)], packages_model.EmptyFileKey)
289289
if err != nil {
290290
if err == packages_model.ErrPackageFileNotExist {
291291
apiError(ctx, http.StatusNotFound, err)
@@ -294,7 +294,7 @@ func UploadPackageFile(ctx *context.Context) {
294294
apiError(ctx, http.StatusInternalServerError, err)
295295
return
296296
}
297-
pb, err := packages_model.GetBlobByID(ctx, pf.BlobID)
297+
pb, err := packages_model.GetBlobByID(stdCtx, pf.BlobID)
298298
if err != nil {
299299
apiError(ctx, http.StatusInternalServerError, err)
300300
return
@@ -340,7 +340,7 @@ func UploadPackageFile(ctx *context.Context) {
340340
}
341341

342342
if pvci.Metadata != nil {
343-
pv, err := packages_model.GetVersionByNameAndVersion(ctx, pvci.Owner.ID, pvci.PackageType, pvci.Name, pvci.Version)
343+
pv, err := packages_model.GetVersionByNameAndVersion(stdCtx, pvci.Owner.ID, pvci.PackageType, pvci.Name, pvci.Version)
344344
if err != nil && err != packages_model.ErrPackageNotExist {
345345
apiError(ctx, http.StatusInternalServerError, err)
346346
return
@@ -352,7 +352,7 @@ func UploadPackageFile(ctx *context.Context) {
352352
return
353353
}
354354
pv.MetadataJSON = string(raw)
355-
if err := packages_model.UpdateVersion(ctx, pv); err != nil {
355+
if err := packages_model.UpdateVersion(stdCtx, pv); err != nil {
356356
apiError(ctx, http.StatusInternalServerError, err)
357357
return
358358
}
@@ -366,7 +366,7 @@ func UploadPackageFile(ctx *context.Context) {
366366
}
367367

368368
_, _, err = packages_service.CreatePackageOrAddFileToExisting(
369-
ctx,
369+
stdCtx,
370370
pvci,
371371
pfci,
372372
)

0 commit comments

Comments
 (0)