Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*: fix etcd version, match pd release-7.5 #1761

Merged
merged 1 commit into from
Dec 12, 2024
Merged

*: fix etcd version, match pd release-7.5 #1761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/tidb-dashboard/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (

"github.com/pingcap/log"
flag "github.com/spf13/pflag"
"go.etcd.io/etcd/client/pkg/v3/transport"
"go.etcd.io/etcd/pkg/transport"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"

Expand Down
12 changes: 6 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ require (
github.com/swaggo/http-swagger v1.2.6
github.com/swaggo/swag v1.7.9
github.com/vmihailenco/msgpack/v5 v5.3.5
go.etcd.io/etcd/client/pkg/v3 v3.5.15
go.etcd.io/etcd/client/v3 v3.5.15
go.etcd.io/etcd v0.5.0-alpha.5.0.20240320135013-950cd5fbe6ca
go.uber.org/atomic v1.9.0
go.uber.org/fx v1.12.0
go.uber.org/goleak v1.1.10
Expand All @@ -70,8 +69,10 @@ require (
github.com/bytedance/sonic v1.9.1 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/fogleman/gg v1.3.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
Expand All @@ -86,6 +87,7 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
Expand All @@ -105,7 +107,6 @@ require (
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.15 // indirect
go.uber.org/dig v1.9.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
golang.org/x/arch v0.3.0 // indirect
Expand All @@ -118,10 +119,9 @@ require (
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)
81 changes: 72 additions & 9 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/apiserver/clusterinfo/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"time"

"github.com/gin-gonic/gin"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/fx"

"github.com/pingcap/tidb-dashboard/pkg/apiserver/clusterinfo/hostinfo"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/configuration/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strconv"

"github.com/joomcode/errorx"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/fx"
"gorm.io/gorm"

Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/conprof/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"

"github.com/gin-gonic/gin"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/fx"

"github.com/pingcap/tidb-dashboard/pkg/apiserver/user"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/debugapi/endpoint/payload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"regexp"
"strconv"

clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"

"github.com/pingcap/tidb-dashboard/pkg/pd"
"github.com/pingcap/tidb-dashboard/pkg/utils/topology"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/debugapi/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/gin-gonic/gin"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/fx"

"github.com/pingcap/tidb-dashboard/pkg/apiserver/debugapi/endpoint"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/info/info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/Masterminds/semver"
"github.com/gin-gonic/gin"
"github.com/samber/lo"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/fx"

"github.com/pingcap/tidb-dashboard/pkg/apiserver/user"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/metrics/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"github.com/joomcode/errorx"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/atomic"
"go.uber.org/fx"
"golang.org/x/sync/singleflight"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/profiling/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/joomcode/errorx"
"github.com/pingcap/log"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/fx"
"go.uber.org/zap"

Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/utils/ngm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"github.com/gin-gonic/gin"
"github.com/joomcode/errorx"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/fx"
"golang.org/x/sync/singleflight"

Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/url"
"strings"

"go.etcd.io/etcd/client/pkg/v3/transport"
"go.etcd.io/etcd/pkg/transport"

"github.com/pingcap/tidb-dashboard/pkg/utils/version"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/dynamic_config_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/cenkalti/backoff/v4"
"github.com/joomcode/errorx"
"github.com/pingcap/log"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/fx"
"go.uber.org/zap"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/keyvisual/decorator/tidb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"sync"
"time"

clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/fx"

"github.com/pingcap/tidb-dashboard/pkg/config"
Expand Down
2 changes: 1 addition & 1 deletion pkg/keyvisual/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/joomcode/errorx"
"github.com/pingcap/log"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/fx"
"go.uber.org/zap"

Expand Down
2 changes: 1 addition & 1 deletion pkg/pd/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"github.com/pingcap/log"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/fx"
"go.uber.org/zap"

Expand Down
2 changes: 1 addition & 1 deletion pkg/tidb/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/VividCortex/mysqlerr"
"github.com/go-sql-driver/mysql"
"github.com/pingcap/log"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/fx"
"go.uber.org/zap"
mysqlDriver "gorm.io/driver/mysql"
Expand Down
2 changes: 1 addition & 1 deletion pkg/tidb/forwarder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/cenkalti/backoff/v4"
"github.com/pingcap/log"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/fx"

"github.com/pingcap/tidb-dashboard/pkg/utils/topology"
Expand Down
2 changes: 1 addition & 1 deletion pkg/tikv/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strconv"
"time"

"go.etcd.io/etcd/client/pkg/v3/transport"
"go.etcd.io/etcd/pkg/transport"
"go.uber.org/fx"

"github.com/pingcap/tidb-dashboard/pkg/config"
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/topology/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/pingcap/log"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/zap"

"github.com/pingcap/tidb-dashboard/util/distro"
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/topology/ticdc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"

"github.com/pingcap/log"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/zap"

"github.com/pingcap/tidb-dashboard/util/distro"
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/topology/tidb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"time"

"github.com/pingcap/log"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/zap"

"github.com/pingcap/tidb-dashboard/util/distro"
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/topology/tiproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"

"github.com/pingcap/log"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/zap"

"github.com/pingcap/tidb-dashboard/util/distro"
Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/topology/topology.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/joomcode/errorx"
"github.com/pingcap/log"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/zap"

"github.com/pingcap/tidb-dashboard/util/distro"
Expand Down
2 changes: 1 addition & 1 deletion util/client/pdclient/etcd_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"time"

"github.com/pingcap/log"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/backoff"
Expand Down
2 changes: 1 addition & 1 deletion util/topo/pdtopo/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package pdtopo
import (
"context"

clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"

"github.com/pingcap/tidb-dashboard/util/topo"
)
Expand Down
2 changes: 1 addition & 1 deletion util/topo/pdtopo/provider_pd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package pdtopo
import (
"context"

clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"

"github.com/pingcap/tidb-dashboard/util/client/pdclient"
"github.com/pingcap/tidb-dashboard/util/topo"
Expand Down
2 changes: 1 addition & 1 deletion util/topo/pdtopo/std_comp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/joomcode/errorx"
"github.com/pingcap/log"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/zap"

"github.com/pingcap/tidb-dashboard/util/topo"
Expand Down
2 changes: 1 addition & 1 deletion util/topo/pdtopo/tidb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"time"

"github.com/pingcap/log"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/clientv3"
"go.uber.org/zap"

"github.com/pingcap/tidb-dashboard/util/distro"
Expand Down
Loading