Skip to content

Commit

Permalink
Remove transaction for archive download
Browse files Browse the repository at this point in the history
  • Loading branch information
lunny committed Oct 3, 2024
1 parent a989404 commit e95d8fb
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions services/repository/archiver/archiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,7 @@ func (aReq *ArchiveRequest) Await(ctx context.Context) (*repo_model.RepoArchiver
}

func doArchive(ctx context.Context, r *ArchiveRequest) (*repo_model.RepoArchiver, error) {
txCtx, committer, err := db.TxContext(ctx)
if err != nil {
return nil, err
}
defer committer.Close()
ctx, _, finished := process.GetManager().AddContext(txCtx, fmt.Sprintf("ArchiveRequest[%d]: %s", r.RepoID, r.GetArchiveName()))
ctx, _, finished := process.GetManager().AddContext(ctx, fmt.Sprintf("ArchiveRequest[%d]: %s", r.RepoID, r.GetArchiveName()))
defer finished()

archiver, err := repo_model.GetRepoArchiver(ctx, r.RepoID, r.Type, r.CommitID)
Expand Down Expand Up @@ -192,7 +187,7 @@ func doArchive(ctx context.Context, r *ArchiveRequest) (*repo_model.RepoArchiver
return nil, err
}
}
return archiver, committer.Commit()
return archiver, nil
}

if !errors.Is(err, os.ErrNotExist) {
Expand Down Expand Up @@ -261,7 +256,7 @@ func doArchive(ctx context.Context, r *ArchiveRequest) (*repo_model.RepoArchiver
}
}

return archiver, committer.Commit()
return archiver, nil
}

// ArchiveRepository satisfies the ArchiveRequest being passed in. Processing
Expand Down

0 comments on commit e95d8fb

Please sign in to comment.