fix: various issues

argoproj-labs · Jun 8, 2021 · abbf7d0 · abbf7d0
1 parent c6a9e6e
commit abbf7d0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/api/v1alpha1/const.go b/api/v1alpha1/const.go
@@ -23,8 +23,8 @@ const (
 	EnvStep                = "ARGO_DATAFLOW_STEP"
 	EnvPeekDelay           = "ARGO_DATAFLOW_PEEK_DELAY"      // how long between peeking (default 4m)
 	EnvPullPolicy          = "ARGO_DATAFLOW_PULL_POLICY"     // default ""
-	EnvScalingDelay        = "ARGO_DATAFLOW_SCALING_DELAY"   // // how long to wait between any scaling events (including peeking) default "4m"
-	EnvUpdateInterval      = "ARGO_DATAFLOW_UPDATE_INTERVAL" // default "30s"
+	EnvScalingDelay        = "ARGO_DATAFLOW_SCALING_DELAY"   // how long to wait between any scaling events (including peeking) default "4m"
+	EnvUpdateInterval      = "ARGO_DATAFLOW_UPDATE_INTERVAL" // default "1m"
 	EnvDataflowBearerToken = "ARGO_DATAFLOW_BEARER_TOKEN"
 	// label/annotation keys
 	KeyDefaultContainer = "kubectl.kubernetes.io/default-container"

diff --git a/manager/controllers/config.go b/manager/controllers/config.go
@@ -17,7 +17,7 @@ var (
 	imageFormat    = os.Getenv(dfv1.EnvImageFormat)
 	runnerImage    = ""
 	pullPolicy     = corev1.PullPolicy(os.Getenv(dfv1.EnvPullPolicy))
-	updateInterval = util.GetEnvDuration(dfv1.EnvUpdateInterval, 30*time.Second)
+	updateInterval = util.GetEnvDuration(dfv1.EnvUpdateInterval, 1*time.Minute)
 	logger         = util.NewLogger()
 )
 

diff --git a/runner/sidecar/sidecar.go b/runner/sidecar/sidecar.go
@@ -6,6 +6,7 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
+	"math"
 	"net/http"
 	"os"
 	"strconv"
@@ -343,8 +344,9 @@ func connectSources(ctx context.Context, toMain func([]byte) error) error {
 			})
 			err := wait.ExponentialBackoff(wait.Backoff{
 				Duration: 100 * time.Millisecond,
-				Factor:   2,
-				Cap:      time.Second,
+				Factor:   1.2,
+				Jitter:   1.2,
+				Steps:    math.MaxInt32,
 			}, func() (done bool, err error) {
 				select {
 				case <-ctx.Done():
@@ -359,8 +361,8 @@ func connectSources(ctx context.Context, toMain func([]byte) error) error {
 							return false, nil
 						}
 					}
+					return true, nil
 				}
-				return true, nil
 			})
 			if err != nil {
 				withLock(func() { step.Status.SourceStatuses.IncErrors(sourceName, replica, err) })

diff --git a/shared/util/rand_test.go b/shared/util/rand_test.go
@@ -7,5 +7,5 @@ import (
 )
 
 func Test_RandString(t *testing.T) {
-	assert.Len(t, RandString(), 28)
+	assert.NotEmpty(t, RandString())
 }