move circuit breaker to pkg

Signed-off-by: Ryan Leung <[email protected]>
rleungx · Dec 18, 2024 · e2c7315 · e2c7315
1 parent 2d970a6
commit e2c7315
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 4 deletions.
diff --git a/client/client.go b/client/client.go
@@ -34,7 +34,6 @@ import (
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
 
-	cb "github.com/tikv/pd/client/circuitbreaker"
 	"github.com/tikv/pd/client/clients/metastorage"
 	"github.com/tikv/pd/client/clients/router"
 	"github.com/tikv/pd/client/clients/tso"
@@ -43,6 +42,7 @@ import (
 	"github.com/tikv/pd/client/metrics"
 	"github.com/tikv/pd/client/opt"
 	"github.com/tikv/pd/client/pkg/caller"
+	cb "github.com/tikv/pd/client/pkg/circuitbreaker"
 	"github.com/tikv/pd/client/pkg/utils/tlsutil"
 	sd "github.com/tikv/pd/client/servicediscovery"
 )

diff --git a/client/inner_client.go b/client/inner_client.go
@@ -15,11 +15,11 @@ import (
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
 
-	cb "github.com/tikv/pd/client/circuitbreaker"
 	"github.com/tikv/pd/client/clients/tso"
 	"github.com/tikv/pd/client/errs"
 	"github.com/tikv/pd/client/metrics"
 	"github.com/tikv/pd/client/opt"
+	cb "github.com/tikv/pd/client/pkg/circuitbreaker"
 	sd "github.com/tikv/pd/client/servicediscovery"
 )
 

diff --git a/client/opt/option.go b/client/opt/option.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/pingcap/errors"
 
-	cb "github.com/tikv/pd/client/circuitbreaker"
+	cb "github.com/tikv/pd/client/pkg/circuitbreaker"
 	"github.com/tikv/pd/client/pkg/retry"
 )
 

diff --git a/client/circuitbreaker/circuit_breaker.go → client/pkg/circuitbreaker/circuit_breaker.go b/client/circuitbreaker/circuit_breaker.go → client/pkg/circuitbreaker/circuit_breaker.go
diff --git a/...nt/circuitbreaker/circuit_breaker_test.go → ...kg/circuitbreaker/circuit_breaker_test.go b/...nt/circuitbreaker/circuit_breaker_test.go → ...kg/circuitbreaker/circuit_breaker_test.go
diff --git a/pkg/errs/errno.go b/pkg/errs/errno.go
@@ -41,7 +41,6 @@ var (
 // tso errors
 var (
 	ErrGetAllocator                     = errors.Normalize("get allocator failed, %s", errors.RFCCodeText("PD:tso:ErrGetAllocator"))
-	ErrGetLocalAllocator                = errors.Normalize("get local allocator failed, %s", errors.RFCCodeText("PD:tso:ErrGetLocalAllocator"))
 	ErrResetUserTimestamp               = errors.Normalize("reset user timestamp failed, %s", errors.RFCCodeText("PD:tso:ErrResetUserTimestamp"))
 	ErrGenerateTimestamp                = errors.Normalize("generate timestamp failed, %s", errors.RFCCodeText("PD:tso:ErrGenerateTimestamp"))
 	ErrUpdateTimestamp                  = errors.Normalize("update timestamp failed, %s", errors.RFCCodeText("PD:tso:ErrUpdateTimestamp"))