Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

functional: increase dial timeout

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-04-11 20:18:17 -07:00
parent 554dfaa4ba
commit ce19e0b4b5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functional/rpcpb/member.go
View File

@ -95,7 +95,7 @@ func (m *Member) CreateEtcdClient(opts ...grpc.DialOption) (*clientv3.Client, er
cfg := clientv3.Config{ cfg := clientv3.Config{
Endpoints: []string{m.EtcdClientEndpoint}, Endpoints: []string{m.EtcdClientEndpoint},
DialTimeout: 5 * time.Second, DialTimeout: 10 * time.Second,
DialOptions: opts, DialOptions: opts,
} }
if secure { if secure {

9
functional/tester/case_sigquit_remove_quorum.go
View File

@ -183,9 +183,10 @@ func (c *fetchSnapshotCaseQuorum) Recover(clus *Cluster) error {
for idx := range c.injected { for idx := range c.injected {
idxs = append(idxs, idx) idxs = append(idxs, idx)
} }
clus.lg.Info("member add START", zap.Int("members-to-add", len(idxs)))
for i, idx := range idxs { for i, idx := range idxs {
clus.lg.Info( clus.lg.Info(
"member add request START", "member add request SENT",
zap.String("target-endpoint", clus.Members[idx].EtcdClientEndpoint), zap.String("target-endpoint", clus.Members[idx].EtcdClientEndpoint),
zap.Strings("peer-urls", clus.Members[idx].Etcd.AdvertisePeerURLs), zap.Strings("peer-urls", clus.Members[idx].Etcd.AdvertisePeerURLs),
) )
@ -193,7 +194,7 @@ func (c *fetchSnapshotCaseQuorum) Recover(clus *Cluster) error {
_, err := leaderc.MemberAdd(ctx, clus.Members[idx].Etcd.AdvertisePeerURLs) _, err := leaderc.MemberAdd(ctx, clus.Members[idx].Etcd.AdvertisePeerURLs)
cancel() cancel()
clus.lg.Info( clus.lg.Info(
"member add request END", "member add request DONE",
zap.String("target-endpoint", clus.Members[idx].EtcdClientEndpoint), zap.String("target-endpoint", clus.Members[idx].EtcdClientEndpoint),
zap.Strings("peer-urls", clus.Members[idx].Etcd.AdvertisePeerURLs), zap.Strings("peer-urls", clus.Members[idx].Etcd.AdvertisePeerURLs),
zap.Error(err), zap.Error(err),
@ -211,13 +212,13 @@ func (c *fetchSnapshotCaseQuorum) Recover(clus *Cluster) error {
} }
clus.Members[idx].EtcdOnSnapshotRestore.InitialCluster = strings.Join(initClus, ",") clus.Members[idx].EtcdOnSnapshotRestore.InitialCluster = strings.Join(initClus, ",")
clus.lg.Info( clus.lg.Info(
"restart from snapshot request START", "restart from snapshot request SENT",
zap.String("target-endpoint", clus.Members[idx].EtcdClientEndpoint), zap.String("target-endpoint", clus.Members[idx].EtcdClientEndpoint),
zap.Strings("initial-cluster", initClus), zap.Strings("initial-cluster", initClus),
) )
err = clus.sendOp(idx, rpcpb.Operation_RESTART_FROM_SNAPSHOT) err = clus.sendOp(idx, rpcpb.Operation_RESTART_FROM_SNAPSHOT)
clus.lg.Info( clus.lg.Info(
"restart from snapshot request END", "restart from snapshot request DONE",
zap.String("target-endpoint", clus.Members[idx].EtcdClientEndpoint), zap.String("target-endpoint", clus.Members[idx].EtcdClientEndpoint),
zap.Strings("initial-cluster", initClus), zap.Strings("initial-cluster", initClus),
zap.Error(err), zap.Error(err),