diff options
| author | zeripath <art27@cantab.net> | 2020-08-11 21:05:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 21:05:34 +0100 |
| commit | 74bd9691c685942798f2761607731697498ceeae (patch) | |
| tree | 531d661263b839ccf8aa6af73bfb6710984f0dd9 /modules/indexer/code | |
| parent | faa676cc8b4419ac56fbf9d009ea8c6b79834024 (diff) | |
| download | gitea-74bd9691c685942798f2761607731697498ceeae.tar.gz gitea-74bd9691c685942798f2761607731697498ceeae.zip | |
Re-attempt to delete temporary upload if the file is locked by another process (#12447)
Replace all calls to os.Remove/os.RemoveAll by retrying util.Remove/util.RemoveAll and remove circular dependencies from util.
Fix #12339
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'modules/indexer/code')
| -rw-r--r-- | modules/indexer/code/bleve.go | 5 | ||||
| -rw-r--r-- | modules/indexer/code/bleve_test.go | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/modules/indexer/code/bleve.go b/modules/indexer/code/bleve.go index 576cc3e5e4..6502259ba4 100644 --- a/modules/indexer/code/bleve.go +++ b/modules/indexer/code/bleve.go @@ -19,6 +19,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" + "code.gitea.io/gitea/modules/util" "github.com/blevesearch/bleve" analyzer_custom "github.com/blevesearch/bleve/analysis/analyzer/custom" @@ -75,14 +76,14 @@ func openIndexer(path string, latestVersion int) (bleve.Index, error) { if metadata.Version < latestVersion { // the indexer is using a previous version, so we should delete it and // re-populate - return nil, os.RemoveAll(path) + return nil, util.RemoveAll(path) } index, err := bleve.Open(path) if err != nil && err == upsidedown.IncompatibleVersion { // the indexer was built with a previous version of bleve, so we should // delete it and re-populate - return nil, os.RemoveAll(path) + return nil, util.RemoveAll(path) } else if err != nil { return nil, err } diff --git a/modules/indexer/code/bleve_test.go b/modules/indexer/code/bleve_test.go index 89cfceea2d..2b3128ac88 100644 --- a/modules/indexer/code/bleve_test.go +++ b/modules/indexer/code/bleve_test.go @@ -6,12 +6,12 @@ package code import ( "io/ioutil" - "os" "path/filepath" "testing" "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" "github.com/stretchr/testify/assert" ) @@ -29,7 +29,7 @@ func TestIndexAndSearch(t *testing.T) { assert.Fail(t, "Unable to create temporary directory") return } - defer os.RemoveAll(dir) + defer util.RemoveAll(dir) setting.Indexer.RepoIndexerEnabled = true idx, _, err := NewBleveIndexer(dir) |