Use different (longer) login retries config

Author: arielshaqed

cmd/lakectl/cmd/login.go

@@ -48,7 +48,8 @@ var loginCmd = &cobra.Command{
 			DieErr(fmt.Errorf("get server URL %s: %w", cfg.Server.EndpointURL, err))
 		}
 
-		client := getClient(apigen.WithHTTPClient(getHTTPClient(loginRetryPolicy)))
+		httpClient := getHTTPClientWithRetryConfig(loginRetryPolicy, cfg.Server.LoginRetries)
+		client := getClient(apigen.WithHTTPClient(httpClient))
 		tokenRedirect, err := client.GetTokenRedirectWithResponse(cmd.Context())
 		// TODO(ariels): Change back to http.StatusSeeOther after fixing lakeFS server!
 		DieOnErrorOrUnexpectedStatusCode(tokenRedirect, err, http.StatusOK)

cmd/lakectl/cmd/root.go

@@ -92,8 +92,9 @@ type Configuration struct {
 		} `mapstructure:"http2"`
 	} `mapstructure:"network"`
 	Server struct {
-		EndpointURL lakefsconfig.OnlyString `mapstructure:"endpoint_url"`
-		Retries     RetriesCfg              `mapstructure:"retries"`
+		EndpointURL  lakefsconfig.OnlyString `mapstructure:"endpoint_url"`
+		Retries      RetriesCfg              `mapstructure:"retries"`
+		LoginRetries RetriesCfg              `mapstructure:"login_retries"`
 	} `mapstructure:"server"`
 	Options struct {
 		Parallelism int `mapstructure:"parallelism"`
@@ -182,6 +183,10 @@ const (
 	defaultMaxAttempts      = 4
 	defaultMaxRetryInterval = 30 * time.Second
 	defaultMinRetryInterval = 200 * time.Millisecond
+
+	defaultBrowserLoginMaxAttempts      = 75
+	defaultBrowserLoginMaxRetryInterval = 1 * time.Second
+	defaultBrowserLoginMinRetryInterval = 50 * time.Millisecond
 )
 
 const (
@@ -558,6 +563,10 @@ func sendStats(cmd *cobra.Command, cmdSuffix string) {
 }
 
 func getHTTPClient(checkRetry func(ctx context.Context, resp *http.Response, err error) (bool, error)) *http.Client {
+	return getHTTPClientWithRetryConfig(checkRetry, cfg.Server.Retries)
+}
+
+func getHTTPClientWithRetryConfig(checkRetry func(ctx context.Context, resp *http.Response, err error) (bool, error), retriesCfg RetriesCfg) *http.Client {
 	// Override MaxIdleConnsPerHost to allow highly concurrent access to our API client.
 	// This is done to avoid accumulating many sockets in `TIME_WAIT` status that were closed
 	// only to be immediately reopened.
@@ -568,10 +577,10 @@ func getHTTPClient(checkRetry func(ctx context.Context, resp *http.Response, err
 		transport.TLSClientConfig.NextProtos = []string{}
 	}
 	transport.MaxIdleConnsPerHost = DefaultMaxIdleConnsPerHost
-	if !cfg.Server.Retries.Enabled {
+	if !retriesCfg.Enabled {
 		return &http.Client{Transport: transport}
 	}
-	return NewRetryClient(cfg.Server.Retries, transport, checkRetry)
+	return NewRetryClient(retriesCfg, transport, checkRetry)
 }
 
 func newAWSIAMAuthProviderConfig() (*awsiam.IAMAuthParams, error) {
@@ -915,11 +924,15 @@ func initConfig() {
 
 	// set defaults
 	viper.SetDefault("server.endpoint_url", "http://127.0.0.1:8000")
+	viper.SetDefault("network.http2.enabled", defaultHTTP2Enabled)
 	viper.SetDefault("server.retries.enabled", true)
 	viper.SetDefault("server.retries.max_attempts", defaultMaxAttempts)
-	viper.SetDefault("network.http2.enabled", defaultHTTP2Enabled)
 	viper.SetDefault("server.retries.max_wait_interval", defaultMaxRetryInterval)
 	viper.SetDefault("server.retries.min_wait_interval", defaultMinRetryInterval)
+	viper.SetDefault("server.login_retries.enabled", true)
+	viper.SetDefault("server.login_retries.max_attempts", defaultBrowserLoginMaxAttempts)
+	viper.SetDefault("server.login_retries.max_wait_interval", defaultBrowserLoginMaxRetryInterval)
+	viper.SetDefault("server.login_retries.min_wait_interval", defaultBrowserLoginMinRetryInterval)
 	viper.SetDefault("experimental.local.posix_permissions.enabled", false)
 	viper.SetDefault("local.skip_non_regular_files", false)
 	viper.SetDefault("local.symlink_support", false)