Handle keyword search error when issue indexer service is not available

Author: lafriks

models/db/engine.go

@@ -65,6 +65,7 @@ type Engine interface {
 	Query(...interface{}) ([]map[string][]byte, error)
 	Cols(...string) *xorm.Session
 	Context(ctx context.Context) *xorm.Session
+	Ping() error
 }
 
 // TableInfo returns table's information via an object

modules/indexer/issues/db.go

@@ -4,41 +4,44 @@
 
 package issues
 
-import "code.gitea.io/gitea/models"
+import (
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/models/db"
+)
 
 // DBIndexer implements Indexer interface to use database's like search
 type DBIndexer struct{}
 
 // Init dummy function
-func (db *DBIndexer) Init() (bool, error) {
+func (i *DBIndexer) Init() (bool, error) {
 	return false, nil
 }
 
 // SetAvailabilityChangeCallback dummy function
-func (db *DBIndexer) SetAvailabilityChangeCallback(callback func(bool)) {
+func (i *DBIndexer) SetAvailabilityChangeCallback(callback func(bool)) {
 }
 
 // Ping checks if database is available
-func (db *DBIndexer) Ping() bool {
-	return models.Ping() != nil
+func (i *DBIndexer) Ping() bool {
+	return db.GetEngine(db.DefaultContext).Ping() != nil
 }
 
 // Index dummy function
-func (db *DBIndexer) Index(issue []*IndexerData) error {
+func (i *DBIndexer) Index(issue []*IndexerData) error {
 	return nil
 }
 
 // Delete dummy function
-func (db *DBIndexer) Delete(ids ...int64) error {
+func (i *DBIndexer) Delete(ids ...int64) error {
 	return nil
 }
 
 // Close dummy function
-func (db *DBIndexer) Close() {
+func (i *DBIndexer) Close() {
 }
 
 // Search dummy function
-func (db *DBIndexer) Search(kw string, repoIDs []int64, limit, start int) (*SearchResult, error) {
+func (i *DBIndexer) Search(kw string, repoIDs []int64, limit, start int) (*SearchResult, error) {
 	total, ids, err := models.SearchIssueIDsByKeyword(kw, repoIDs, limit, start)
 	if err != nil {
 		return nil, err

modules/indexer/issues/elastic_search.go

@@ -8,6 +8,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"net"
 	"strconv"
 	"time"
 
@@ -260,7 +261,8 @@ func (b *ElasticSearchIndexer) Close() {
 }
 
 func (b *ElasticSearchIndexer) checkError(err error) error {
-	if elastic.IsConnErr(err) && b.available {
+	var opErr *net.OpError
+	if b.available && (elastic.IsConnErr(err) || (errors.As(err, &opErr) && (opErr.Op == "dial" || opErr.Op == "read"))) {
 		b.available = false
 		if b.availabilityCallback != nil {
 			b.availabilityCallback(b.available)

modules/indexer/issues/indexer.go

@@ -387,3 +387,14 @@ func SearchIssuesByKeyword(repoIDs []int64, keyword string) ([]int64, error) {
 	}
 	return issueIDs, nil
 }
+
+// IsAvailable checks if issue indexer is available
+func IsAvailable() bool {
+	indexer := holder.get()
+	if indexer == nil {
+		log.Error("IsAvailable(): unable to get indexer!")
+		return false
+	}
+
+	return indexer.Ping()
+}

options/locale/locale_en-US.ini

@@ -1262,6 +1262,7 @@ issues.filter_sort.moststars = Most stars
 issues.filter_sort.feweststars = Fewest stars
 issues.filter_sort.mostforks = Most forks
 issues.filter_sort.fewestforks = Fewest forks
+issues.keyword_search_unavailable = Currently searhing by keyword is not available. Please contact your site administrator.
 issues.action_open = Open
 issues.action_close = Close
 issues.action_label = Label

routers/web/repo/issue.go

@@ -163,8 +163,11 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti
 	if len(keyword) > 0 {
 		issueIDs, err = issue_indexer.SearchIssuesByKeyword([]int64{repo.ID}, keyword)
 		if err != nil {
-			ctx.ServerError("issueIndexer.Search", err)
-			return
+			if issue_indexer.IsAvailable() {
+				ctx.ServerError("issueIndexer.Search", err)
+				return
+			}
+			ctx.Data["IssueIndexerUnavailable"] = true
 		}
 		if len(issueIDs) == 0 {
 			forceEmpty = true

templates/shared/issuelist.tmpl

@@ -139,5 +139,10 @@
 			</div>
 		</li>
 	{{end}}
+	{{if .IssueIndexerUnavailable}}
+		<div class="ui error message">
+			<p>{{$.i18n.Tr "repo.issues.keyword_search_unavailable"}}</p>
+		</div>
+	{{end}}
 </div>
 {{template "base/paginate" .}}