From 822d7823f893f9658cd23ac1f496e4c320ce639a Mon Sep 17 00:00:00 2001
From: Nils Hanke <nils.hanke@outlook.com>
Date: Mon, 20 Mar 2023 12:44:12 +0100
Subject: [PATCH] cli: refuse to retry init once gRPC has reached READY one
 time

---
 cli/internal/cmd/init.go | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/cli/internal/cmd/init.go b/cli/internal/cmd/init.go
index 773e9d4ec..ccb89c689 100644
--- a/cli/internal/cmd/init.go
+++ b/cli/internal/cmd/init.go
@@ -222,15 +222,22 @@ func (i *initCmd) initCall(ctx context.Context, dialer grpcDialer, ip string, re
 }
 
 type initDoer struct {
-	dialer   grpcDialer
-	endpoint string
-	req      *initproto.InitRequest
-	resp     *initproto.InitResponse
-	log      debugLog
-	spinner  spinnerInterf
+	dialer        grpcDialer
+	endpoint      string
+	req           *initproto.InitRequest
+	resp          *initproto.InitResponse
+	log           debugLog
+	spinner       spinnerInterf
+	connectedOnce bool
 }
 
 func (d *initDoer) Do(ctx context.Context) error {
+	// connectedOnce is set in handleGRPCStateChanges when a connection was established in one retry attempt.
+	// This should cancel any other retry attempts when the connection is lost since the bootstrapper likely won't accept any new attempts anymore.
+	if d.connectedOnce {
+		return &nonRetriableError{errors.New("init already connected to the remote server in an previous attempt - resumption is not supported")}
+	}
+
 	conn, err := d.dialer.Dial(ctx, d.endpoint)
 	if err != nil {
 		d.log.Debugf("Dialing init server failed: %w. Retrying...", err)
@@ -266,6 +273,7 @@ func (d *initDoer) handleGRPCStateChanges(ctx context.Context, wg *sync.WaitGrou
 		}
 		if state == connectivity.Ready {
 			d.log.Debugf("Connection ready")
+			d.connectedOnce = true
 			d.spinner.Stop()
 			d.spinner.Start("Initializing cluster ", false)
 		} else {