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

Jump to bottom

Reload cert/key of tls for new connection in pd/kv client #939

Merged
merged 2 commits into from
Mar 26, 2020
Merged

Reload cert/key of tls for new connection in pd/kv client #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3073a10
Reload cert/key of tls for new connection in pd/kv client
WangXiangUSTC Mar 21, 2020
403b087
minor fix
WangXiangUSTC Mar 22, 2020
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 binlogctl/meta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/BurntSushi/toml"
"github.com/pingcap/errors"
"github.com/pingcap/log"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v3/client"
"github.com/pingcap/tidb-binlog/pkg/flags"
"github.com/pingcap/tidb-binlog/pkg/util"
"github.com/siddontang/go/ioutil2"
Expand Down
4 changes: 2 additions & 2 deletions binlogctl/meta_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"strings"

. "github.com/pingcap/check"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v3/client"
)

type metaSuite struct{}
Expand Down Expand Up @@ -61,7 +61,7 @@ func (c dummyCli) GetTS(ctx context.Context) (int64, int64, error) {
return c.physical, c.logical, c.err
}

func newFakePDClient([]string, pd.SecurityOption) (pd.Client, error) {
func newFakePDClient([]string, pd.SecurityOption, ...pd.ClientOption) (pd.Client, error) {
return &dummyCli{
physical: 123,
logical: 456,
Expand Down
2 changes: 1 addition & 1 deletion drainer/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

"github.com/gorilla/mux"
. "github.com/pingcap/check"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v3/client"
"github.com/pingcap/tidb-binlog/pkg/etcd"
"github.com/pingcap/tidb-binlog/pkg/node"
"github.com/pingcap/tidb-binlog/pkg/security"
Expand Down
38 changes: 17 additions & 21 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,24 @@ require (
github.com/Shopify/sarama v1.24.1
github.com/dustin/go-humanize v1.0.0
github.com/go-sql-driver/mysql v1.4.1
github.com/gogo/protobuf v1.2.1
github.com/gogo/protobuf v1.3.1
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
github.com/golang/mock v1.2.0
github.com/golang/protobuf v1.3.2
github.com/google/btree v1.0.0 // indirect
github.com/golang/protobuf v1.3.3
github.com/google/gofuzz v1.0.0
github.com/gorilla/mux v1.6.2
github.com/grpc-ecosystem/grpc-gateway v1.7.0 // indirect
github.com/gorilla/mux v1.7.3
github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d
github.com/pingcap/check v0.0.0-20190102082844-67f458068fc8
github.com/pingcap/errors v0.11.4
github.com/pingcap/kvproto v0.0.0-20191118050206-47672e7eabc0
github.com/pingcap/log v0.0.0-20190715063458-479153f07ebd
github.com/pingcap/parser v0.0.0-20200103153514-95649ba8a872
github.com/pingcap/pd v1.1.0-beta.0.20190923032047-5c648dc365e0
github.com/pingcap/tidb v1.1.0-beta.0.20191120070053-5a7ecfeb94fd
github.com/pingcap/tidb-tools v3.1.0-beta.0.20191227034743-57985f125c52+incompatible
github.com/pingcap/tipb v0.0.0-20191120045257-1b9900292ab6
github.com/pingcap/check v0.0.0-20191216031241-8a5a85928f12
github.com/pingcap/errors v0.11.5-0.20190809092503-95897b64e011
github.com/pingcap/kvproto v0.0.0-20200317043902-2838e21ca222
github.com/pingcap/log v0.0.0-20200117041106-d28c14d3b1cd
github.com/pingcap/parser v3.1.0-beta.1.0.20200318061433-f0b8f6cdca0d+incompatible
github.com/pingcap/pd/v3 v3.1.0-beta.2.0.20200312100832-1206736bd050
github.com/pingcap/tidb v1.1.0-beta.0.20200319063417-875036363e1e
github.com/pingcap/tidb-tools v4.0.0-beta.1.0.20200317092225-ed6b2a87af54+incompatible
kennytm marked this conversation as resolved.
Show resolved Hide resolved
github.com/pingcap/tipb v0.0.0-20191126033718-169898888b24
github.com/prometheus/client_golang v1.0.0
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a
github.com/samuel/go-zookeeper v0.0.0-20170815201139-e6b59f6144be
github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726
Expand All @@ -34,16 +32,14 @@ require (
github.com/syndtr/goleveldb v1.0.1-0.20190625010220-02440ea7a285
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
github.com/unrolled/render v0.0.0-20180914162206-b9786414de4d
go.etcd.io/etcd v0.5.0-alpha.5.0.20190320044326-77d4b742cdbf
go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738
go.uber.org/atomic v1.5.1 // indirect
go.uber.org/multierr v1.4.0 // indirect
go.uber.org/zap v1.13.0
golang.org/x/crypto v0.0.0-20191029031824-8986dd9e96cf // indirect
golang.org/x/net v0.0.0-20190909003024-a7b16738d86b
golang.org/x/net v0.0.0-20200202094626-16171245cfb2
golang.org/x/sync v0.0.0-20190423024810-112230192c58
golang.org/x/sys v0.0.0-20190909082730-f460065e899a
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
google.golang.org/grpc v1.23.0
google.golang.org/grpc v1.25.1
)

go 1.13
305 changes: 212 additions & 93 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pkg/security/security_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ func (s *testSecuritySuite) TestToTiDBSecurityConfig(c *C) {
}()

newSecurityConfig := dummyConfig.ToTiDBSecurityConfig()
c.Assert(oldSecurityConfig, Not(Equals), newSecurityConfig)
c.Assert(oldSecurityConfig, Not(DeepEquals), newSecurityConfig)
c.Assert(newSecurityConfig.ClusterSSLCA, Equals, dummyConfig.SSLCA)
c.Assert(newSecurityConfig.ClusterSSLKey, Equals, dummyConfig.SSLKey)
c.Assert(newSecurityConfig.ClusterSSLCert, Equals, dummyConfig.SSLCert)
c.Assert(globalConfig.Security, Equals, newSecurityConfig)
c.Assert(globalConfig.Security, DeepEquals, newSecurityConfig)
}

func (s *testSecuritySuite) TestToTLSConfig(c *C) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/ts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (

"github.com/pingcap/errors"
"github.com/pingcap/log"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v3/client"
"github.com/pingcap/tidb/store/tikv/oracle"
"go.uber.org/zap"
"golang.org/x/net/context"
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/ts_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"time"

. "github.com/pingcap/check"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v3/client"
)

type tsSuite struct{}
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/log"
"github.com/pingcap/parser/model"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v3/client"
"github.com/pingcap/tidb-binlog/pkg/flags"
"github.com/pingcap/tidb-binlog/pkg/security"
"github.com/pingcap/tidb/kv"
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/pingcap/log"
"github.com/pingcap/parser/model"
"github.com/pingcap/parser/mysql"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v3/client"
"github.com/pingcap/tidb-binlog/pkg/security"
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/types"
Expand Down Expand Up @@ -189,7 +189,7 @@ func (s *getPdClientSuite) TestShouldRejectInvalidAddr(c *C) {
func (s *getPdClientSuite) TestShouldRetPdCli(c *C) {
expected := dummyCli{}
origF := newPdCli
newPdCli = func(pdAddrs []string, security pd.SecurityOption) (pd.Client, error) {
newPdCli = func(pdAddrs []string, security pd.SecurityOption, _ ...pd.ClientOption) (pd.Client, error) {
return expected, nil
}
defer func() {
Expand Down
2 changes: 1 addition & 1 deletion pump/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/gorilla/mux"
"github.com/pingcap/errors"
"github.com/pingcap/log"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v3/client"
"github.com/pingcap/tidb-binlog/pkg/flags"
"github.com/pingcap/tidb-binlog/pkg/node"
"github.com/pingcap/tidb-binlog/pkg/util"
Expand Down
6 changes: 3 additions & 3 deletions pump/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"time"

. "github.com/pingcap/check"
pd "github.com/pingcap/pd/client"
pd "github.com/pingcap/pd/v3/client"
"github.com/pingcap/tidb-binlog/pkg/etcd"
"github.com/pingcap/tidb-binlog/pkg/node"
"github.com/pingcap/tidb-binlog/pkg/security"
Expand Down Expand Up @@ -556,7 +556,7 @@ func (pc *mockPdCli) Close() {}
type newServerSuite struct {
origGetPdClientFn func(string, security.Config) (pd.Client, error)
origNewKVStoreFn func(string) (kv.Storage, error)
origNewTiKVLockResolverFn func([]string, config.Security) (*tikv.LockResolver, error)
origNewTiKVLockResolverFn func([]string, config.Security, ...pd.ClientOption) (*tikv.LockResolver, error)
cfg *Config
}

Expand Down Expand Up @@ -616,7 +616,7 @@ func (s *newServerSuite) TestCreateNewPumpServer(c *C) {
getPdClientFn = func(string, security.Config) (pd.Client, error) {
return &mockPdCli{}, nil
}
newTiKVLockResolverFn = func([]string, config.Security) (*tikv.LockResolver, error) {
newTiKVLockResolverFn = func([]string, config.Security, ...pd.ClientOption) (*tikv.LockResolver, error) {
return nil, nil
}
newKVStoreFn = func(path string) (kv.Storage, error) {
Expand Down