lianguan/gitea
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add finalizers to ensure that repos are closed and blobreaders are closed (#19495) (#19496)" (#19659)

Browse Source 
This reverts commit 88da50674fbffb5cb339d61503d2b89aecfc1823.

because it caused a memleak
This commit is contained in:
Lunny Xiao 2022-05-09 19:03:44 +08:00 committed by GitHub
parent 0a2d618d85
commit c7c18e0eb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
modules/git/blob_nogogit.go
View File

@ -12,11 +12,8 @@ import (
"bytes"
"io"
"math"
"runtime"
"sync"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
)
// Blob represents a Git object.
@ -57,15 +54,11 @@ func (b *Blob) DataAsync() (io.ReadCloser, error) {
return io.NopCloser(bytes.NewReader(bs)), err
}
br := &blobReader{
repo: b.repo,
return &blobReader{
rd: rd,
n: size,
cancel: cancel,
}
runtime.SetFinalizer(br, (*blobReader).finalizer)
return br, nil
}, nil
}
// Size returns the uncompressed size of the blob
@ -93,10 +86,6 @@ func (b *Blob) Size() int64 {
}
type blobReader struct {
lock sync.Mutex
closed bool
repo *Repository
rd *bufio.Reader
n int64
cancel func()
@ -115,57 +104,27 @@ func (b *blobReader) Read(p []byte) (n int, err error) {
}
// Close implements io.Closer
func (b *blobReader) Close() (err error) {
b.lock.Lock()
defer b.lock.Unlock()
if b.closed {
return
}
return b.close()
}
func (b *blobReader) close() (err error) {
func (b *blobReader) Close() error {
defer b.cancel()
b.closed = true
if b.n > 0 {
var n int
for b.n > math.MaxInt32 {
n, err = b.rd.Discard(math.MaxInt32)
n, err := b.rd.Discard(math.MaxInt32)
b.n -= int64(n)
if err != nil {
return
return err
}
b.n -= math.MaxInt32
}
n, err = b.rd.Discard(int(b.n))
n, err := b.rd.Discard(int(b.n))
b.n -= int64(n)
if err != nil {
return
return err
}
}
if b.n == 0 {
_, err = b.rd.Discard(1)
_, err := b.rd.Discard(1)
b.n--
return
return err
}
return
}
func (b *blobReader) finalizer() error {
if b == nil {
return nil
}
b.lock.Lock()
defer b.lock.Unlock()
if b.closed {
return nil
}
pid := ""
if b.repo.Ctx != nil {
pid = " from PID: " + string(process.GetPID(b.repo.Ctx))
}
log.Error("Finalizer running on unclosed blobReader%s: %s%s", pid, b.repo.Path)
return b.close()
}

51
modules/git/repo_base_gogit.go
View File

@ -12,12 +12,8 @@ import (
"context"
"errors"
"path/filepath"
"runtime"
"sync"
"code.gitea.io/gitea/modules/log"
gitealog "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
"github.com/go-git/go-billy/v5/osfs"
@ -32,9 +28,6 @@ type Repository struct {
tagCache *ObjectCache
lock sync.Mutex
closed bool
gogitRepo *gogit.Repository
gogitStorage *filesystem.Storage
gpgSettings *GPGSettings
@ -70,57 +63,23 @@ func OpenRepositoryCtx(ctx context.Context, repoPath string) (*Repository, error
return nil, err
}
repo := &Repository{
return &Repository{
Path: repoPath,
gogitRepo: gogitRepo,
gogitStorage: storage,
tagCache: newObjectCache(),
Ctx: ctx,
}
runtime.SetFinalizer(repo, (*Repository).finalizer)
return repo, nil
}, nil
}
// Close this repository, in particular close the underlying gogitStorage if this is not nil
func (repo *Repository) Close() (err error) {
if repo == nil {
func (repo *Repository) Close() {
if repo == nil || repo.gogitStorage == nil {
return
}
repo.lock.Lock()
defer repo.lock.Unlock()
return repo.close()
}
func (repo *Repository) close() (err error) {
repo.closed = true
if repo.gogitStorage == nil {
return
}
err = repo.gogitStorage.Close()
if err != nil {
if err := repo.gogitStorage.Close(); err != nil {
gitealog.Error("Error closing storage: %v", err)
}
return
}
func (repo *Repository) finalizer() error {
if repo == nil {
return nil
}
repo.lock.Lock()
defer repo.lock.Unlock()
if !repo.closed {
pid := ""
if repo.Ctx != nil {
pid = " from PID: " + string(process.GetPID(repo.Ctx))
}
log.Error("Finalizer running on unclosed repository%s: %s%s", pid, repo.Path)
}
// We still need to run the close fn as it may be possible to reopen the gogitrepo after close
return repo.close()
}
// GoGitRepo gets the go-git repo representation

63
modules/git/repo_base_nogogit.go
View File

@ -13,11 +13,8 @@ import (
"context"
"errors"
"path/filepath"
"runtime"
"sync"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
)
// Repository represents a Git repository.
@ -28,10 +25,6 @@ type Repository struct {
gpgSettings *GPGSettings
lock sync.Mutex
closed bool
batchCancel context.CancelFunc
batchReader *bufio.Reader
batchWriter WriteCloserError
@ -71,57 +64,29 @@ func OpenRepositoryCtx(ctx context.Context, repoPath string) (*Repository, error
repo.batchWriter, repo.batchReader, repo.batchCancel = CatFileBatch(ctx, repoPath)
repo.checkWriter, repo.checkReader, repo.checkCancel = CatFileBatchCheck(ctx, repo.Path)
runtime.SetFinalizer(repo, (*Repository).finalizer)
return repo, nil
}
// CatFileBatch obtains a CatFileBatch for this repository
func (repo *Repository) CatFileBatch(ctx context.Context) (WriteCloserError, *bufio.Reader, func()) {
repo.lock.Lock()
defer repo.lock.Unlock()
if repo.closed || repo.batchReader.Buffered() > 0 {
if repo.batchCancel == nil || repo.batchReader.Buffered() > 0 {
log.Debug("Opening temporary cat file batch for: %s", repo.Path)
return CatFileBatch(ctx, repo.Path)
}
if repo.batchCancel == nil {
repo.batchWriter, repo.batchReader, repo.batchCancel = CatFileBatch(ctx, repo.Path)
}
return repo.batchWriter, repo.batchReader, func() {}
}
// CatFileBatchCheck obtains a CatFileBatchCheck for this repository
func (repo *Repository) CatFileBatchCheck(ctx context.Context) (WriteCloserError, *bufio.Reader, func()) {
repo.lock.Lock()
defer repo.lock.Unlock()
if repo.closed || repo.checkReader.Buffered() > 0 {
if repo.checkCancel == nil || repo.checkReader.Buffered() > 0 {
log.Debug("Opening temporary cat file batch-check: %s", repo.Path)
return CatFileBatchCheck(ctx, repo.Path)
}
if repo.checkCancel == nil {
repo.checkWriter, repo.checkReader, repo.checkCancel = CatFileBatchCheck(ctx, repo.Path)
}
return repo.checkWriter, repo.checkReader, func() {}
}
// Close this repository, in particular close the underlying gogitStorage if this is not nil
func (repo *Repository) Close() (err error) {
if repo == nil {
return
}
repo.lock.Lock()
defer repo.lock.Unlock()
return repo.close()
}
func (repo *Repository) close() (err error) {
func (repo *Repository) Close() {
if repo == nil {
return
}
@ -137,26 +102,4 @@ func (repo *Repository) close() (err error) {
repo.checkReader = nil
repo.checkWriter = nil
}
repo.closed = true
return
}
func (repo *Repository) finalizer() (err error) {
if repo == nil {
return
}
repo.lock.Lock()
defer repo.lock.Unlock()
if repo.closed {
return nil
}
if repo.batchCancel != nil || repo.checkCancel != nil {
pid := ""
if repo.Ctx != nil {
pid = " from PID: " + string(process.GetPID(repo.Ctx))
}
log.Error("Finalizer running on unclosed repository%s: %s%s", pid, repo.Path)
}
return repo.close()
}