[WIP] Fix data race caused by blevesearch/bleve

.drone.yml

@@ -123,6 +123,7 @@ pipeline:
     group: test
     environment:
       TAGS: bindata
+      EXTRA_GOFLAGS: -race
     commands:
       - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
       - apt-get install -y git-lfs
@@ -153,6 +154,7 @@ pipeline:
     environment:
       TAGS: bindata
       TEST_LDAP: "1"
+      EXTRA_GOFLAGS: -race
     commands:
       - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
       - apt-get install -y git-lfs
@@ -168,6 +170,7 @@ pipeline:
     environment:
       TAGS: bindata
       TEST_LDAP: "1"
+      EXTRA_GOFLAGS: -race
     commands:
       - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
       - apt-get install -y git-lfs

Gopkg.toml

@@ -107,3 +107,8 @@ ignored = ["google.golang.org/appengine*"]
 [[override]]
   revision = "c10ba270aa0bf8b8c1c986e103859c67a9103061"
   name = "golang.org/x/oauth2"
+
+[[override]]
+  name = "github.com/blevesearch/bleve"
+  revision = "e70b2878dfb7d5b8610709077b3b467980f413a3"
+  source = "github.com/typeless/bleve"

Makefile

@@ -231,13 +231,13 @@ integration-test-coverage: integrations.cover.test generate-ini
 	GITEA_ROOT=${CURDIR} GITEA_CONF=integrations/mysql.ini ./integrations.cover.test -test.coverprofile=integration.coverage.out
 
 integrations.test: $(SOURCES)
-	$(GO) test -c code.gitea.io/gitea/integrations -o integrations.test
+	$(GO) test -c code.gitea.io/gitea/integrations ${EXTRA_GOFLAGS} -o integrations.test
 
 integrations.sqlite.test: $(SOURCES)
-	$(GO) test -c code.gitea.io/gitea/integrations -o integrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
+	$(GO) test -c code.gitea.io/gitea/integrations ${EXTRA_GOFLAGS} -o integrations.sqlite.test -tags 'sqlite sqlite_unlock_notify'
 
 integrations.cover.test: $(SOURCES)
-	$(GO) test -c code.gitea.io/gitea/integrations -coverpkg $(shell echo $(PACKAGES) | tr ' ' ',') -o integrations.cover.test
+	$(GO) test -c code.gitea.io/gitea/integrations ${EXTRA_GOFLAGS} -coverpkg $(shell echo $(PACKAGES) | tr ' ' ',') -o integrations.cover.test
 
 .PHONY: check
 check: test

integrations/integration_test.go

@@ -22,6 +22,7 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/racedetector"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/routers"
 	"code.gitea.io/gitea/routers/routes"
@@ -80,6 +81,9 @@ func initIntegrationTest() {
 		fmt.Println("Environment variable $GITEA_ROOT not set")
 		os.Exit(1)
 	}
+	if racedetector.Enabled {
+		setting.AppBuiltWith = " (race detector enabled)"
+	}
 	setting.AppPath = path.Join(giteaRoot, "gitea")
 	if _, err := os.Stat(setting.AppPath); err != nil {
 		fmt.Printf("Could not find gitea binary at %s\n", setting.AppPath)

main.go

@@ -12,6 +12,7 @@ import (
 
 	"code.gitea.io/gitea/cmd"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/racedetector"
 	"code.gitea.io/gitea/modules/setting"
 	// register supported doc types
 	_ "code.gitea.io/gitea/modules/markup/csv"
@@ -61,5 +62,9 @@ func formatBuiltWith(Tags string) string {
 		return ""
 	}
 
-	return " built with: " + strings.Replace(Tags, " ", ", ", -1)
+	s := " built with: " + strings.Replace(Tags, " ", ", ", -1)
+	if racedetector.Enabled {
+		s += " (race detector enabled)"
+	}
+	return s
 }

modules/racedetector/race_disabled.go

@@ -0,0 +1,10 @@
+// Copyright 2018 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+// +build !race
+
+package racedetector
+
+// Enabled is true if race detector is enabled.
+var Enabled = false

modules/racedetector/race_enabled.go

@@ -0,0 +1,10 @@
+// Copyright 2018 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+// +build race
+
+package racedetector
+
+// Enabled is true if race detector is enabled.
+var Enabled = true