diff options
| author | zeripath <art27@cantab.net> | 2021-11-30 20:06:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 20:06:32 +0000 |
| commit | 01087e9eef21ff5ea1cebbb1e84933954671fdf2 (patch) | |
| tree | ae618785a3bd46e012096683e2fd2309f87c571d /modules/indexer | |
| parent | d894c90b703ce215e2319ae2e2bf95989f77805d (diff) | |
| download | gitea-01087e9eef21ff5ea1cebbb1e84933954671fdf2.tar.gz gitea-01087e9eef21ff5ea1cebbb1e84933954671fdf2.zip | |
Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125)
This PR registers requests with the process manager and manages hierarchy within the processes.
Git repos are then associated with a context, (usually the request's context) - with sub commands using this context as their base context.
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'modules/indexer')
| -rw-r--r-- | modules/indexer/code/bleve.go | 2 | ||||
| -rw-r--r-- | modules/indexer/code/elastic_search.go | 2 | ||||
| -rw-r--r-- | modules/indexer/stats/db.go | 9 |
3 files changed, 10 insertions, 3 deletions
diff --git a/modules/indexer/code/bleve.go b/modules/indexer/code/bleve.go index 66b2602d3b..97d5fb082c 100644 --- a/modules/indexer/code/bleve.go +++ b/modules/indexer/code/bleve.go @@ -275,7 +275,7 @@ func (b *BleveIndexer) Index(repo *models.Repository, sha string, changes *repoC batch := gitea_bleve.NewFlushingBatch(b.indexer, maxBatchSize) if len(changes.Updates) > 0 { - batchWriter, batchReader, cancel := git.CatFileBatch(repo.RepoPath()) + batchWriter, batchReader, cancel := git.CatFileBatch(git.DefaultContext, repo.RepoPath()) defer cancel() for _, update := range changes.Updates { diff --git a/modules/indexer/code/elastic_search.go b/modules/indexer/code/elastic_search.go index f76f316f64..6e0813dc15 100644 --- a/modules/indexer/code/elastic_search.go +++ b/modules/indexer/code/elastic_search.go @@ -248,7 +248,7 @@ func (b *ElasticSearchIndexer) Index(repo *models.Repository, sha string, change reqs := make([]elastic.BulkableRequest, 0) if len(changes.Updates) > 0 { - batchWriter, batchReader, cancel := git.CatFileBatch(repo.RepoPath()) + batchWriter, batchReader, cancel := git.CatFileBatch(git.DefaultContext, repo.RepoPath()) defer cancel() for _, update := range changes.Updates { diff --git a/modules/indexer/stats/db.go b/modules/indexer/stats/db.go index 87e8677a28..9e251d0f69 100644 --- a/modules/indexer/stats/db.go +++ b/modules/indexer/stats/db.go @@ -5,9 +5,13 @@ package stats import ( + "fmt" + "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/process" ) // DBIndexer implements Indexer interface to use database's like search @@ -16,6 +20,9 @@ type DBIndexer struct { // Index repository status function func (db *DBIndexer) Index(id int64) error { + ctx, _, finished := process.GetManager().AddContext(graceful.GetManager().ShutdownContext(), fmt.Sprintf("Stats.DB Index Repo[%d]", id)) + defer finished() + repo, err := models.GetRepositoryByID(id) if err != nil { return err @@ -29,7 +36,7 @@ func (db *DBIndexer) Index(id int64) error { return err } - gitRepo, err := git.OpenRepository(repo.RepoPath()) + gitRepo, err := git.OpenRepositoryCtx(ctx, repo.RepoPath()) if err != nil { return err } |