a1ae83f36e
This PR addresses #19586 I added a mutex to the upload version creation which will prevent the push errors when two requests try to create these database entries. I'm not sure if this should be the final solution for this problem. I added a workaround to allow a reupload of missing blobs. Normally a reupload is skipped because the database knows the blob is already present. The workaround checks if the blob exists on the file system. This should not be needed anymore with the above fix so I marked this code to be removed with Gitea v1.20. Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
66 lines
1.9 KiB
Go
66 lines
1.9 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package packages
|
|
|
|
import (
|
|
"io"
|
|
"path"
|
|
"strings"
|
|
|
|
"code.gitea.io/gitea/modules/storage"
|
|
"code.gitea.io/gitea/modules/util"
|
|
)
|
|
|
|
// BlobHash256Key is the key to address a blob content
|
|
type BlobHash256Key string
|
|
|
|
// ContentStore is a wrapper around ObjectStorage
|
|
type ContentStore struct {
|
|
store storage.ObjectStorage
|
|
}
|
|
|
|
// NewContentStore creates the default package store
|
|
func NewContentStore() *ContentStore {
|
|
contentStore := &ContentStore{storage.Packages}
|
|
return contentStore
|
|
}
|
|
|
|
// Get gets a package blob
|
|
func (s *ContentStore) Get(key BlobHash256Key) (storage.Object, error) {
|
|
return s.store.Open(KeyToRelativePath(key))
|
|
}
|
|
|
|
// FIXME: Workaround to be removed in v1.20
|
|
// https://github.com/go-gitea/gitea/issues/19586
|
|
func (s *ContentStore) Has(key BlobHash256Key) error {
|
|
_, err := s.store.Stat(KeyToRelativePath(key))
|
|
return err
|
|
}
|
|
|
|
// Save stores a package blob
|
|
func (s *ContentStore) Save(key BlobHash256Key, r io.Reader, size int64) error {
|
|
_, err := s.store.Save(KeyToRelativePath(key), r, size)
|
|
return err
|
|
}
|
|
|
|
// Delete deletes a package blob
|
|
func (s *ContentStore) Delete(key BlobHash256Key) error {
|
|
return s.store.Delete(KeyToRelativePath(key))
|
|
}
|
|
|
|
// KeyToRelativePath converts the sha256 key aabb000000... to aa/bb/aabb000000...
|
|
func KeyToRelativePath(key BlobHash256Key) string {
|
|
return path.Join(string(key)[0:2], string(key)[2:4], string(key))
|
|
}
|
|
|
|
// RelativePathToKey converts a relative path aa/bb/aabb000000... to the sha256 key aabb000000...
|
|
func RelativePathToKey(relativePath string) (BlobHash256Key, error) {
|
|
parts := strings.SplitN(relativePath, "/", 3)
|
|
if len(parts) != 3 || len(parts[0]) != 2 || len(parts[1]) != 2 || len(parts[2]) < 4 || parts[0]+parts[1] != parts[2][0:4] {
|
|
return "", util.ErrInvalidArgument
|
|
}
|
|
|
|
return BlobHash256Key(parts[2]), nil
|
|
}
|