Browse Source

functional: increase dial timeout

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 7 years ago
parent
commit
ce19e0b4b5
2 changed files with 6 additions and 5 deletions
  1. 1 1
      functional/rpcpb/member.go
  2. 5 4
      functional/tester/case_sigquit_remove_quorum.go

+ 1 - 1
functional/rpcpb/member.go

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

+ 5 - 4
functional/tester/case_sigquit_remove_quorum.go

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