Fix archive error when rename repo or user (#16399)
Use repo id instead of full name to generate archive path
This commit is contained in:
parent
b81106be3f
commit
67f135ca5d
5 changed files with 35 additions and 23 deletions
|
@ -1764,22 +1764,6 @@ func GetPrivateRepositoryCount(u *User) (int64, error) {
|
|||
return getPrivateRepositoryCount(x, u)
|
||||
}
|
||||
|
||||
// DeleteRepositoryArchives deletes all repositories' archives.
|
||||
func DeleteRepositoryArchives(ctx context.Context) error {
|
||||
return x.
|
||||
Where("id > 0").
|
||||
Iterate(new(Repository),
|
||||
func(idx int, bean interface{}) error {
|
||||
repo := bean.(*Repository)
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return ErrCancelledf("before deleting repository archives for %s", repo.FullName())
|
||||
default:
|
||||
}
|
||||
return util.RemoveAll(filepath.Join(repo.RepoPath(), "archives"))
|
||||
})
|
||||
}
|
||||
|
||||
// DeleteOldRepositoryArchives deletes old repository archives.
|
||||
func DeleteOldRepositoryArchives(ctx context.Context, olderThan time.Duration) error {
|
||||
log.Trace("Doing: ArchiveCleanup")
|
||||
|
|
|
@ -52,12 +52,7 @@ func (archiver *RepoArchiver) LoadRepo() (*Repository, error) {
|
|||
|
||||
// RelativePath returns relative path
|
||||
func (archiver *RepoArchiver) RelativePath() (string, error) {
|
||||
repo, err := archiver.LoadRepo()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return fmt.Sprintf("%s/%s/%s.%s", repo.FullName(), archiver.CommitID[:2], archiver.CommitID, archiver.Type.String()), nil
|
||||
return fmt.Sprintf("%d/%s/%s.%s", archiver.RepoID, archiver.CommitID[:2], archiver.CommitID, archiver.Type.String()), nil
|
||||
}
|
||||
|
||||
// GetRepoArchiver get an archiver
|
||||
|
@ -84,3 +79,9 @@ func UpdateRepoArchiverStatus(ctx DBContext, archiver *RepoArchiver) error {
|
|||
_, err := ctx.e.ID(archiver.ID).Cols("status").Update(archiver)
|
||||
return err
|
||||
}
|
||||
|
||||
// DeleteAllRepoArchives deletes all repo archives records
|
||||
func DeleteAllRepoArchives() error {
|
||||
_, err := x.Where("1=1").Delete(new(RepoArchiver))
|
||||
return err
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue