diff options
| author | zeripath <art27@cantab.net> | 2019-10-15 14:39:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 14:39:51 +0100 |
| commit | 167e8f18da3aadcdcdd7bb8c488c39d73ac65803 (patch) | |
| tree | c2ad32fc8ced5657f62034551e72134a0a238fcb /models/repo_indexer.go | |
| parent | 4a290bd64cd4c4ba77b9f3c4908a76cc521f9621 (diff) | |
| download | gitea-167e8f18da3aadcdcdd7bb8c488c39d73ac65803.tar.gz gitea-167e8f18da3aadcdcdd7bb8c488c39d73ac65803.zip | |
Restore Graceful Restarting & Socket Activation (#7274)
* Prevent deadlock in indexer initialisation during graceful restart
* Move from gracehttp to our own service to add graceful ssh
* Add timeout for start of indexers and make hammer time configurable
* Fix issue with re-initialization in indexer during tests
* move the code to detect use of closed to graceful
* Handle logs gracefully - add a pid suffix just before restart
* Move to using a cond and a holder for indexers
* use time.Since
* Add some comments and attribution
* update modules.txt
* Use zero to disable timeout
* Move RestartProcess to its own file
* Add cleanup routine
Diffstat (limited to 'models/repo_indexer.go')
| -rw-r--r-- | models/repo_indexer.go | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/models/repo_indexer.go b/models/repo_indexer.go index b842a1c87f..9cc002a8ab 100644 --- a/models/repo_indexer.go +++ b/models/repo_indexer.go @@ -8,10 +8,12 @@ import ( "fmt" "strconv" "strings" + "time" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/charset" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/indexer" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" @@ -70,9 +72,30 @@ func InitRepoIndexer() { if !setting.Indexer.RepoIndexerEnabled { return } + waitChannel := make(chan time.Duration) repoIndexerOperationQueue = make(chan repoIndexerOperation, setting.Indexer.UpdateQueueLength) - indexer.InitRepoIndexer(populateRepoIndexerAsynchronously) - go processRepoIndexerOperationQueue() + go func() { + start := time.Now() + log.Info("Initializing Repository Indexer") + indexer.InitRepoIndexer(populateRepoIndexerAsynchronously) + go processRepoIndexerOperationQueue() + waitChannel <- time.Since(start) + }() + if setting.Indexer.StartupTimeout > 0 { + go func() { + timeout := setting.Indexer.StartupTimeout + if graceful.IsChild && setting.GracefulHammerTime > 0 { + timeout += setting.GracefulHammerTime + } + select { + case duration := <-waitChannel: + log.Info("Repository Indexer Initialization took %v", duration) + case <-time.After(timeout): + log.Fatal("Repository Indexer Initialization Timed-Out after: %v", timeout) + } + }() + + } } // populateRepoIndexerAsynchronously asynchronously populates the repo indexer |