From 366f80cf5483252ebcdad5a8ee2e7d2ccbd38fad Mon Sep 17 00:00:00 2001
From: Oleg Jukovec <oleg.jukovec@tarantool.org>
Date: Wed, 9 Oct 2024 10:53:39 +0300
Subject: [PATCH] replicaset: fix `vshard bootstrap` default timeout

It was 3s instead of 10s.

Closes https://github.com/tarantool/tt-ee/issues/232
---
 CHANGELOG.md          |  1 +
 cli/cmd/replicaset.go | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce73362d9..ae8f3a392 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - `tt start` error on start Tarantool 3 with encrypted etcd.
 - `tt replicaset vshard bootstrap` unable to bootstrap large clusters due to
   a timeout.
+- `tt replicaset vshard bootstrap` timeout was 3s instead of 10s.
 
 ### Changed
 
diff --git a/cli/cmd/replicaset.go b/cli/cmd/replicaset.go
index 5068def08..3820a309a 100644
--- a/cli/cmd/replicaset.go
+++ b/cli/cmd/replicaset.go
@@ -36,6 +36,7 @@ var (
 	replicasetSslCiphers               string
 	replicasetForce                    bool
 	replicasetTimeout                  int
+	replicasetBootstrapTimeout         int
 	replicasetIntegrityPrivateKey      string
 	replicasetBootstrapVshard          bool
 	replicasetCartridgeReplicasetsFile string
@@ -178,8 +179,8 @@ func newBootstrapCmd() *cobra.Command {
 		`file where replicasets configuration is described (default "<APP_DIR>/replicasets.yml")`)
 	cmd.Flags().StringVarP(&replicasetReplicasetName, "replicaset", "",
 		"", "replicaset name for an instance bootstrapping")
-	cmd.Flags().IntVarP(&replicasetTimeout, "timeout", "", replicasetcmd.
-		VShardBootstrapDefaultTimeout, "timeout")
+	cmd.Flags().IntVarP(&replicasetBootstrapTimeout, "timeout", "",
+		replicasetcmd.VShardBootstrapDefaultTimeout, "timeout")
 
 	return cmd
 }
@@ -206,7 +207,7 @@ func newBootstrapVShardCmd() *cobra.Command {
 	addOrchestratorFlags(cmd)
 	addTarantoolConnectFlags(cmd)
 	integrity.RegisterWithIntegrityFlag(cmd.Flags(), &replicasetIntegrityPrivateKey)
-	cmd.Flags().IntVarP(&replicasetTimeout, "timeout", "",
+	cmd.Flags().IntVarP(&replicasetBootstrapTimeout, "timeout", "",
 		replicasetcmd.VShardBootstrapDefaultTimeout, "timeout")
 
 	return cmd
@@ -619,7 +620,7 @@ func internalReplicasetBootstrapVShardModule(cmdCtx *cmdcontext.CmdCtx, args []s
 		Orchestrator:  ctx.Orchestrator,
 		Publishers:    publishers,
 		Collectors:    collectors,
-		Timeout:       replicasetTimeout,
+		Timeout:       replicasetBootstrapTimeout,
 	})
 }
 
@@ -638,7 +639,7 @@ func internalReplicasetBootstrapModule(cmdCtx *cmdcontext.CmdCtx, args []string)
 		ReplicasetsFile: replicasetCartridgeReplicasetsFile,
 		Orchestrator:    ctx.Orchestrator,
 		RunningCtx:      ctx.RunningCtx,
-		Timeout:         replicasetTimeout,
+		Timeout:         replicasetBootstrapTimeout,
 		BootstrapVShard: replicasetBootstrapVshard,
 		Replicaset:      replicasetReplicasetName,
 	}