瀏覽代碼

Prevent dangling archiver goroutine (#19516)

Within doArchive there is a service goroutine that performs the
archiving function.  This goroutine reports its error using a `chan
error` called `done`. Prior to this PR this channel had 0 capacity
meaning that the goroutine would block until the `done` channel was
cleared - however there are a couple of ways in which this channel might
not be read.

The simplest solution is to add a single space of capacity to the
goroutine which will mean that the goroutine will always complete and
even if the `done` channel is not read it will be simply garbage
collected away.

(The PR also contains two other places when setting up the indexers
which do not leak but where the blocking of the sending goroutine is
also unnecessary and so we should just add a small amount of capacity
and let the sending goroutine complete as soon as it can.)

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: 6543 <6543@obermui.de>
tags/v1.18.0-dev
zeripath 2 年之前
父節點
當前提交
41fcf7b7de
No account linked to committer's email address
共有 3 個文件被更改,包括 3 次插入3 次删除
  1. 1
    1
      modules/indexer/code/indexer.go
  2. 1
    1
      modules/indexer/issues/indexer.go
  3. 1
    1
      services/repository/archiver/archiver.go

+ 1
- 1
modules/indexer/code/indexer.go 查看文件

@@ -133,7 +133,7 @@ func Init() {
finished()
})

waitChannel := make(chan time.Duration)
waitChannel := make(chan time.Duration, 1)

// Create the Queue
switch setting.Indexer.RepoType {

+ 1
- 1
modules/indexer/issues/indexer.go 查看文件

@@ -104,7 +104,7 @@ var (
func InitIssueIndexer(syncReindex bool) {
ctx, _, finished := process.GetManager().AddTypedContext(context.Background(), "Service: IssueIndexer", process.SystemProcessType, false)

waitChannel := make(chan time.Duration)
waitChannel := make(chan time.Duration, 1)

// Create the Queue
switch setting.Indexer.IssueType {

+ 1
- 1
services/repository/archiver/archiver.go 查看文件

@@ -172,7 +172,7 @@ func doArchive(r *ArchiveRequest) (*repo_model.RepoArchiver, error) {
w.Close()
rd.Close()
}()
done := make(chan error)
done := make(chan error, 1) // Ensure that there is some capacity which will ensure that the goroutine below can always finish
repo, err := repo_model.GetRepositoryByID(archiver.RepoID)
if err != nil {
return nil, fmt.Errorf("archiver.LoadRepo failed: %v", err)

Loading…
取消
儲存