Skip to content

Commit

Permalink
Fix check failed on 6.2 (#418)
Browse files Browse the repository at this point in the history 
* use v1alpha1 with gomod

* delete k8s/apis package

* delete grpc-memory-pool-quota from tikv config struct
  • Loading branch information
@nexustar
nexustar authored Oct 27, 2022
1 parent 262d66b commit 9d805ee
Show file tree
Hide file tree
Showing 66 changed files with 84 additions and 50,096 deletions.
34 changes: 17 additions & 17 deletions checker/proto/tiflash_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,23 @@ type TiflashConfig struct {
} `toml:"coprocessor" json:"coprocessor"`
} `toml:"readpool" json:"readpool"`
Server struct {
Addr string `toml:"addr" json:"addr"`
AdvertiseAddr string `toml:"advertise-addr" json:"advertise-addr"`
EngineAddr string `toml:"engine-addr" json:"engine-addr"`
EngineStoreVersion string `toml:"engine-store-version" json:"engine-store-version"`
EngineStoreGitHash string `toml:"engine-store-git-hash" json:"engine-store-git-hash"`
StatusAddr string `toml:"status-addr" json:"status-addr"`
AdvertiseStatusAddr string `toml:"advertise-status-addr" json:"advertise-status-addr"`
StatusThreadPoolSize int `toml:"status-thread-pool-size" json:"status-thread-pool-size"`
MaxGrpcSendMsgLen int `toml:"max-grpc-send-msg-len" json:"max-grpc-send-msg-len"`
RaftClientGrpcSendMsgBuffer int `toml:"raft-client-grpc-send-msg-buffer" json:"raft-client-grpc-send-msg-buffer"`
RaftClientQueueSize int `toml:"raft-client-queue-size" json:"raft-client-queue-size"`
RaftMsgMaxBatchSize int `toml:"raft-msg-max-batch-size" json:"raft-msg-max-batch-size"`
GrpcCompressionType string `toml:"grpc-compression-type" json:"grpc-compression-type"`
GrpcConcurrency int `toml:"grpc-concurrency" json:"grpc-concurrency"`
GrpcConcurrentStream int `toml:"grpc-concurrent-stream" json:"grpc-concurrent-stream"`
GrpcRaftConnNum int `toml:"grpc-raft-conn-num" json:"grpc-raft-conn-num"`
GrpcMemoryPoolQuota int64 `toml:"grpc-memory-pool-quota" json:"grpc-memory-pool-quota"`
Addr string `toml:"addr" json:"addr"`
AdvertiseAddr string `toml:"advertise-addr" json:"advertise-addr"`
EngineAddr string `toml:"engine-addr" json:"engine-addr"`
EngineStoreVersion string `toml:"engine-store-version" json:"engine-store-version"`
EngineStoreGitHash string `toml:"engine-store-git-hash" json:"engine-store-git-hash"`
StatusAddr string `toml:"status-addr" json:"status-addr"`
AdvertiseStatusAddr string `toml:"advertise-status-addr" json:"advertise-status-addr"`
StatusThreadPoolSize int `toml:"status-thread-pool-size" json:"status-thread-pool-size"`
MaxGrpcSendMsgLen int `toml:"max-grpc-send-msg-len" json:"max-grpc-send-msg-len"`
RaftClientGrpcSendMsgBuffer int `toml:"raft-client-grpc-send-msg-buffer" json:"raft-client-grpc-send-msg-buffer"`
RaftClientQueueSize int `toml:"raft-client-queue-size" json:"raft-client-queue-size"`
RaftMsgMaxBatchSize int `toml:"raft-msg-max-batch-size" json:"raft-msg-max-batch-size"`
GrpcCompressionType string `toml:"grpc-compression-type" json:"grpc-compression-type"`
GrpcConcurrency int `toml:"grpc-concurrency" json:"grpc-concurrency"`
GrpcConcurrentStream int `toml:"grpc-concurrent-stream" json:"grpc-concurrent-stream"`
GrpcRaftConnNum int `toml:"grpc-raft-conn-num" json:"grpc-raft-conn-num"`
// GrpcMemoryPoolQuota int64 `toml:"grpc-memory-pool-quota" json:"grpc-memory-pool-quota"`
GrpcStreamInitialWindowSize string `toml:"grpc-stream-initial-window-size" json:"grpc-stream-initial-window-size"`
GrpcKeepaliveTime string `toml:"grpc-keepalive-time" json:"grpc-keepalive-time"`
GrpcKeepaliveTimeout string `toml:"grpc-keepalive-timeout" json:"grpc-keepalive-timeout"`
Expand Down
28 changes: 14 additions & 14 deletions checker/proto/tikv_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,20 @@ type ReadPoolConfig struct {
}

type ServerConfig struct {
Addr string `toml:"addr" json:"addr"`
AdvertiseAddr string `toml:"advertise-addr" json:"advertise-addr"`
StatusAddr string `toml:"status-addr" json:"status-addr"`
AdvertiseStatusAddr string `toml:"advertise-status-addr" json:"advertise-status-addr"`
StatusThreadPoolSize int `toml:"status-thread-pool-size" json:"status-thread-pool-size"`
MaxGrpcSendMsgLen int `toml:"max-grpc-send-msg-len" json:"max-grpc-send-msg-len"`
RaftClientGrpcSendMsgBuffer int `toml:"raft-client-grpc-send-msg-buffer" json:"raft-client-grpc-send-msg-buffer"`
RaftClientQueueSize int `toml:"raft-client-queue-size" json:"raft-client-queue-size"`
RaftMsgMaxBatchSize int `toml:"raft-msg-max-batch-size" json:"raft-msg-max-batch-size"`
GrpcCompressionType string `toml:"grpc-compression-type" json:"grpc-compression-type"`
GrpcConcurrency int `toml:"grpc-concurrency" json:"grpc-concurrency"`
GrpcConcurrentStream int `toml:"grpc-concurrent-stream" json:"grpc-concurrent-stream"`
GrpcRaftConnNum int `toml:"grpc-raft-conn-num" json:"grpc-raft-conn-num"`
GrpcMemoryPoolQuota uint64 `toml:"grpc-memory-pool-quota" json:"grpc-memory-pool-quota"`
Addr string `toml:"addr" json:"addr"`
AdvertiseAddr string `toml:"advertise-addr" json:"advertise-addr"`
StatusAddr string `toml:"status-addr" json:"status-addr"`
AdvertiseStatusAddr string `toml:"advertise-status-addr" json:"advertise-status-addr"`
StatusThreadPoolSize int `toml:"status-thread-pool-size" json:"status-thread-pool-size"`
MaxGrpcSendMsgLen int `toml:"max-grpc-send-msg-len" json:"max-grpc-send-msg-len"`
RaftClientGrpcSendMsgBuffer int `toml:"raft-client-grpc-send-msg-buffer" json:"raft-client-grpc-send-msg-buffer"`
RaftClientQueueSize int `toml:"raft-client-queue-size" json:"raft-client-queue-size"`
RaftMsgMaxBatchSize int `toml:"raft-msg-max-batch-size" json:"raft-msg-max-batch-size"`
GrpcCompressionType string `toml:"grpc-compression-type" json:"grpc-compression-type"`
GrpcConcurrency int `toml:"grpc-concurrency" json:"grpc-concurrency"`
GrpcConcurrentStream int `toml:"grpc-concurrent-stream" json:"grpc-concurrent-stream"`
GrpcRaftConnNum int `toml:"grpc-raft-conn-num" json:"grpc-raft-conn-num"`
// GrpcMemoryPoolQuota uint64 `toml:"grpc-memory-pool-quota" json:"grpc-memory-pool-quota"`
GrpcStreamInitialWindowSize string `toml:"grpc-stream-initial-window-size" json:"grpc-stream-initial-window-size"`
GrpcKeepaliveTime string `toml:"grpc-keepalive-time" json:"grpc-keepalive-time"`
GrpcKeepaliveTimeout string `toml:"grpc-keepalive-timeout" json:"grpc-keepalive-timeout"`
Expand Down
4 changes: 2 additions & 2 deletions collector/collect.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"time"

"github.com/fatih/color"
pingcapv1alpha1 "github.com/pingcap/diag/k8s/apis/pingcap/v1alpha1"
kubetls "github.com/pingcap/diag/k8s/apis/tls"
"github.com/pingcap/diag/pkg/models"
kubetls "github.com/pingcap/diag/pkg/tls"
"github.com/pingcap/diag/pkg/utils"
"github.com/pingcap/errors"
pingcapv1alpha1 "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
"github.com/pingcap/tiup/pkg/cluster/executor"
operator "github.com/pingcap/tiup/pkg/cluster/operation"
"github.com/pingcap/tiup/pkg/cluster/spec"
Expand Down
4 changes: 2 additions & 2 deletions collector/k8s.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"time"

json "github.com/json-iterator/go"
"github.com/pingcap/diag/k8s/apis/label"
pingcapv1alpha1 "github.com/pingcap/diag/k8s/apis/pingcap/v1alpha1"
"github.com/pingcap/diag/pkg/models"
"github.com/pingcap/diag/pkg/utils"
"github.com/pingcap/tidb-operator/pkg/apis/label"
pingcapv1alpha1 "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
2 changes: 1 addition & 1 deletion collector/meta.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"time"

json "github.com/json-iterator/go"
pingcapv1alpha1 "github.com/pingcap/diag/k8s/apis/pingcap/v1alpha1"
"github.com/pingcap/diag/pkg/models"
"github.com/pingcap/diag/version"
pingcapv1alpha1 "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
"github.com/pingcap/tiup/pkg/cluster/api"
"github.com/pingcap/tiup/pkg/cluster/ctxt"
operator "github.com/pingcap/tiup/pkg/cluster/operation"
Expand Down
18 changes: 9 additions & 9 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ require (
github.com/go-openapi/strfmt v0.21.1
github.com/go-openapi/swag v0.19.15
github.com/go-sql-driver/mysql v1.6.0
github.com/google/go-cmp v0.5.6
github.com/google/gofuzz v1.2.0
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0
github.com/influxdata/influxdb v1.9.5
github.com/joho/sqltocsv v0.0.0-20210428211105-a6d6801d59df
Expand All @@ -28,16 +27,16 @@ require (
github.com/lensesio/tableprinter v0.0.0-20201125135848-89e81fc956e7
github.com/lorenzosaino/go-sysctl v0.2.0
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/onsi/gomega v1.17.0
github.com/pingcap/check v0.0.0-20211026125417-57bd13f7b5f0
github.com/pingcap/errors v0.11.5-0.20210425183316-da1aaba5fb63
github.com/pingcap/log v1.1.0
github.com/pingcap/tidb-operator/pkg/apis v1.3.9
github.com/pingcap/tidb/parser v0.0.0-20211124132551-4a1b2e9fe5b5
github.com/pingcap/tiup v1.10.1
github.com/pkg/errors v0.9.1
github.com/prometheus/common v0.34.0
github.com/prometheus/prometheus v1.8.2
github.com/shirou/gopsutil v3.21.11+incompatible
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.4.0
Expand All @@ -51,14 +50,15 @@ require (
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a
gopkg.in/yaml.v3 v3.0.0
k8s.io/api v0.22.4
k8s.io/apiextensions-apiserver v0.22.4
k8s.io/apiextensions-apiserver v0.22.4 // indirect
k8s.io/apimachinery v0.22.4
k8s.io/client-go v0.22.4
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.30.0
k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
sigs.k8s.io/yaml v1.3.0
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/appleboy/easyssh-proxy => github.com/AstroProfundis/easyssh-proxy v1.3.10-0.20211209071554-9910ebdf514e
replace (
github.com/appleboy/easyssh-proxy => github.com/AstroProfundis/easyssh-proxy v1.3.10-0.20211209071554-9910ebdf514e
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
)
Loading

0 comments on commit 9d805ee

Please sign in to comment.