Merge branch 'xiang/cherry-pick' of https://github.com/WangXiangUSTC/…

…tidb into xiang/cherry-pick
pingcap · Dec 19, 2018 · e76be77 · e76be77
2 parents 9d9fd48 + bd559d8
commit e76be77
Show file tree

Hide file tree

Showing 20 changed files with 53 additions and 30 deletions.
diff --git a/Makefile b/Makefile
@@ -109,7 +109,9 @@ explaintest: server
 	@cd cmd/explaintest && ./run-tests.sh -s ../../bin/tidb-server
 
 gotest:
-	$(GO) get github.com/etcd-io/gofail
+	@rm -rf $GOPATH/bin/gofail
+	$(GO) get github.com/pingcap/gofail
+	@which gofail
 	@$(GOFAIL_ENABLE)
 ifeq ("$(TRAVIS_COVERAGE)", "1")
 	@echo "Running in TRAVIS_COVERAGE mode."
@@ -126,21 +128,21 @@ endif
 	@$(GOFAIL_DISABLE)
 
 race:
-	$(GO) get github.com/etcd-io/gofail
+	$(GO) get github.com/pingcap/gofail
 	@$(GOFAIL_ENABLE)
 	@export log_level=debug; \
 	$(GOTEST) -timeout 20m -race $(PACKAGES) || { $(GOFAIL_DISABLE); exit 1; }
 	@$(GOFAIL_DISABLE)
 
 leak:
-	$(GO) get github.com/etcd-io/gofail
+	$(GO) get github.com/pingcap/gofail
 	@$(GOFAIL_ENABLE)
 	@export log_level=debug; \
 	$(GOTEST) -tags leak $(PACKAGES) || { $(GOFAIL_DISABLE); exit 1; }
 	@$(GOFAIL_DISABLE)
 
 tikv_integration_test:
-	$(GO) get github.com/etcd-io/gofail
+	$(GO) get github.com/pingcap/gofail
 	@$(GOFAIL_ENABLE)
 	$(GOTEST) ./store/tikv/. -with-tikv=true || { $(GOFAIL_DISABLE); exit 1; }
 	@$(GOFAIL_DISABLE)

diff --git a/ddl/fail_db_test.go b/ddl/fail_db_test.go
@@ -17,8 +17,8 @@ import (
 	"fmt"
 	"time"
 
-	gofail "github.com/etcd-io/gofail/runtime"
 	. "github.com/pingcap/check"
+	gofail "github.com/pingcap/gofail/runtime"
 	"github.com/pingcap/parser"
 	"github.com/pingcap/parser/model"
 	"github.com/pingcap/tidb/ddl"

diff --git a/ddl/fail_test.go b/ddl/fail_test.go
@@ -14,8 +14,8 @@
 package ddl
 
 import (
-	gofail "github.com/etcd-io/gofail/runtime"
 	. "github.com/pingcap/check"
+	gofail "github.com/pingcap/gofail/runtime"
 	"github.com/pingcap/parser/ast"
 	"github.com/pingcap/parser/model"
 	"github.com/pingcap/tidb/types"

diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -25,10 +25,10 @@ import (
 	"testing"
 	"time"
 
-	gofail "github.com/etcd-io/gofail/runtime"
 	"github.com/golang/protobuf/proto"
 	. "github.com/pingcap/check"
 	"github.com/pingcap/errors"
+	gofail "github.com/pingcap/gofail/runtime"
 	pb "github.com/pingcap/kvproto/pkg/kvrpcpb"
 	"github.com/pingcap/parser"
 	"github.com/pingcap/parser/model"

diff --git a/go.mod b/go.mod
@@ -45,6 +45,7 @@ require (
 	github.com/opentracing/opentracing-go v1.0.2
 	github.com/pingcap/check v0.0.0-20171206051426-1c287c953996
 	github.com/pingcap/errors v0.11.0
+	github.com/pingcap/gofail v0.0.0-20181217135706-6a951c1e42c3
 	github.com/pingcap/goleveldb v0.0.0-20171020084629-8d44bfdf1030
 	github.com/pingcap/kvproto v0.0.0-20181109035735-8e3f33ac4929
 	github.com/pingcap/parser v0.0.0-20181207085916-6c21d4344dfa

diff --git a/go.sum b/go.sum
@@ -86,6 +86,8 @@ github.com/pingcap/check v0.0.0-20171206051426-1c287c953996 h1:ZBdiJCMan6GSo/aPA
 github.com/pingcap/check v0.0.0-20171206051426-1c287c953996/go.mod h1:B1+S9LNcuMyLH/4HMTViQOJevkGiik3wW2AN9zb2fNQ=
 github.com/pingcap/errors v0.11.0 h1:DCJQB8jrHbQ1VVlMFIrbj2ApScNNotVmkSNplu2yUt4=
 github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
+github.com/pingcap/gofail v0.0.0-20181217135706-6a951c1e42c3 h1:04yuCf5NMvLU8rB2m4Qs3rynH7EYpMno3lHkewIOdMo=
+github.com/pingcap/gofail v0.0.0-20181217135706-6a951c1e42c3/go.mod h1:DazNTg0PTldtpsQiT9I5tVJwV1onHMKBBgXzmJUlMns=
 github.com/pingcap/goleveldb v0.0.0-20171020084629-8d44bfdf1030 h1:XJLuW0lsP7vAtQ2iPjZwvXZ14m5urp9No+Qr06ZZcTo=
 github.com/pingcap/goleveldb v0.0.0-20171020084629-8d44bfdf1030/go.mod h1:O17XtbryoCJhkKGbT62+L2OlrniwqiGLSqrmdHCMzZw=
 github.com/pingcap/kvproto v0.0.0-20181109035735-8e3f33ac4929 h1:NAq95+VGsS2G7SjzZ5LP9iUlCMNAs13QUzbNY3G90v8=

diff --git a/owner/fail_test.go b/owner/fail_test.go
@@ -21,8 +21,8 @@ import (
 	"time"
 
 	"github.com/coreos/etcd/clientv3"
-	gofail "github.com/etcd-io/gofail/runtime"
 	. "github.com/pingcap/check"
+	gofail "github.com/pingcap/gofail/runtime"
 	"github.com/pingcap/parser/terror"
 	"github.com/pingcap/tidb/util/logutil"
 	"github.com/pingcap/tidb/util/testleak"

diff --git a/session/session_fail_test.go b/session/session_fail_test.go
@@ -14,8 +14,8 @@
 package session_test
 
 import (
-	gofail "github.com/etcd-io/gofail/runtime"
 	. "github.com/pingcap/check"
+	gofail "github.com/pingcap/gofail/runtime"
 	"github.com/pingcap/tidb/util/testkit"
 )
 

diff --git a/store/tikv/2pc_fail_test.go b/store/tikv/2pc_fail_test.go
@@ -14,9 +14,9 @@
 package tikv
 
 import (
-	gofail "github.com/etcd-io/gofail/runtime"
 	. "github.com/pingcap/check"
 	"github.com/pingcap/errors"
+	gofail "github.com/pingcap/gofail/runtime"
 	"github.com/pingcap/parser/terror"
 	"github.com/pingcap/tidb/kv"
 	"golang.org/x/net/context"

diff --git a/store/tikv/gcworker/gc_worker_test.go b/store/tikv/gcworker/gc_worker_test.go
@@ -19,8 +19,8 @@ import (
 	"testing"
 	"time"
 
-	gofail "github.com/etcd-io/gofail/runtime"
 	. "github.com/pingcap/check"
+	gofail "github.com/pingcap/gofail/runtime"
 	"github.com/pingcap/kvproto/pkg/errorpb"
 	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/session"

diff --git a/store/tikv/sql_fail_test.go b/store/tikv/sql_fail_test.go
@@ -18,8 +18,8 @@ import (
 	"sync"
 	"time"
 
-	gofail "github.com/etcd-io/gofail/runtime"
 	. "github.com/pingcap/check"
+	gofail "github.com/pingcap/gofail/runtime"
 	"github.com/pingcap/parser/terror"
 	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/session"

diff --git a/store/tikv/store_fail_test.go b/store/tikv/store_fail_test.go
@@ -17,8 +17,8 @@ import (
 	"sync"
 	"time"
 
-	gofail "github.com/etcd-io/gofail/runtime"
 	. "github.com/pingcap/check"
+	gofail "github.com/pingcap/gofail/runtime"
 	"golang.org/x/net/context"
 )
 

diff --git a/tablecodec/tablecodec_test.go b/tablecodec/tablecodec_test.go
@@ -19,8 +19,8 @@ import (
 	"testing"
 	"time"
 
-	gofail "github.com/etcd-io/gofail/runtime"
 	. "github.com/pingcap/check"
+	gofail "github.com/pingcap/gofail/runtime"
 	"github.com/pingcap/parser/mysql"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/sessionctx/stmtctx"

diff --git a/vendor/github.com/etcd-io/gofail/LICENSE → vendor/github.com/pingcap/gofail/LICENSE b/vendor/github.com/etcd-io/gofail/LICENSE → vendor/github.com/pingcap/gofail/LICENSE
diff --git a/vendor/github.com/etcd-io/gofail/NOTICE → vendor/github.com/pingcap/gofail/NOTICE b/vendor/github.com/etcd-io/gofail/NOTICE → vendor/github.com/pingcap/gofail/NOTICE
diff --git a/...b.com/etcd-io/gofail/runtime/failpoint.go → ...b.com/pingcap/gofail/runtime/failpoint.go b/...b.com/etcd-io/gofail/runtime/failpoint.go → ...b.com/pingcap/gofail/runtime/failpoint.go
diff --git a/...github.com/etcd-io/gofail/runtime/http.go → ...github.com/pingcap/gofail/runtime/http.go b/...github.com/etcd-io/gofail/runtime/http.go → ...github.com/pingcap/gofail/runtime/http.go
diff --git a/...hub.com/etcd-io/gofail/runtime/runtime.go → ...hub.com/pingcap/gofail/runtime/runtime.go b/...hub.com/etcd-io/gofail/runtime/runtime.go → ...hub.com/pingcap/gofail/runtime/runtime.go
diff --git a/...ithub.com/etcd-io/gofail/runtime/terms.go → ...ithub.com/pingcap/gofail/runtime/terms.go b/...ithub.com/etcd-io/gofail/runtime/terms.go → ...ithub.com/pingcap/gofail/runtime/terms.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -20,8 +20,6 @@ github.com/coreos/etcd/pkg/types
 github.com/cznic/mathutil
 # github.com/cznic/sortutil v0.0.0-20150617083342-4c7342852e65
 github.com/cznic/sortutil
-# github.com/etcd-io/gofail v0.0.0-20180808172546-51ce9a71510a
-github.com/etcd-io/gofail/runtime
 # github.com/go-sql-driver/mysql v0.0.0-20170715192408-3955978caca4
 github.com/go-sql-driver/mysql
 # github.com/gogo/protobuf v1.1.1
@@ -65,6 +63,8 @@ github.com/opentracing/opentracing-go/log
 github.com/pingcap/check
 # github.com/pingcap/errors v0.11.0
 github.com/pingcap/errors
+# github.com/pingcap/gofail v0.0.0-20181217135706-6a951c1e42c3
+github.com/pingcap/gofail/runtime
 # github.com/pingcap/goleveldb v0.0.0-20171020084629-8d44bfdf1030
 github.com/pingcap/goleveldb/leveldb
 github.com/pingcap/goleveldb/leveldb/comparer