Making DLX's resource readiness timeout configurable (#30)

Author: Hedingber

cmd/dlx/app/dlx.go

@@ -2,6 +2,7 @@ package app
 
 import (
 	"os"
+	"time"
 
 	"github.com/v3io/scaler/pkg/dlx"
 	"github.com/v3io/scaler/pkg/pluginloader"
@@ -16,7 +17,8 @@ func Run(kubeconfigPath string,
 	targetNameHeader string,
 	targetPathHeader string,
 	targetPort int,
-	listenAddress string) error {
+	listenAddress string,
+	resourceReadinessTimeout string) error {
 	pluginLoader, err := pluginloader.New()
 	if err != nil {
 		return errors.Wrap(err, "Failed to initialize plugin loader")
@@ -27,12 +29,18 @@ func Run(kubeconfigPath string,
 		return errors.Wrap(err, "Failed to load plugin")
 	}
 
+	resourceReadinessTimeoutDuration, err := time.ParseDuration(resourceReadinessTimeout)
+	if err != nil {
+		return errors.Wrap(err, "Failed to parse resource readiness timeout")
+	}
+
 	dlxOptions := scaler_types.DLXOptions{
-		TargetNameHeader: targetNameHeader,
-		TargetPathHeader: targetPathHeader,
-		TargetPort:       targetPort,
-		ListenAddress:    listenAddress,
-		Namespace:        namespace,
+		TargetNameHeader:         targetNameHeader,
+		TargetPathHeader:         targetPathHeader,
+		TargetPort:               targetPort,
+		ListenAddress:            listenAddress,
+		Namespace:                namespace,
+		ResourceReadinessTimeout: resourceReadinessTimeoutDuration,
 	}
 
 	// see if resource scaler wants to override the arguments

cmd/dlx/main.go

@@ -17,11 +17,12 @@ func main() {
 	targetPathHeader := flag.String("target-path-header", "", "Name of the header that holds information on target path")
 	targetPort := flag.Int("target-port", 0, "Name of the header that holds information on target port")
 	listenAddress := flag.String("listen-address", ":8090", "Address to listen upon for http proxy")
+	resourceReadinessTimeout := flag.String("resource-readiness-timeout", "5m", "maximum wait time for the resource to be ready")
 	flag.Parse()
 
 	*namespace = common.GetNamespace(*namespace)
 
-	if err := app.Run(*kubeconfigPath, *namespace, *targetNameHeader, *targetPathHeader, *targetPort, *listenAddress); err != nil {
+	if err := app.Run(*kubeconfigPath, *namespace, *targetNameHeader, *targetPathHeader, *targetPort, *listenAddress, *resourceReadinessTimeout); err != nil {
 		errors.PrintErrorStack(os.Stderr, err, 5)
 
 		os.Exit(1)

pkg/autoscaler/autoscaler.go

@@ -185,9 +185,9 @@ func (as *Autoscaler) checkResourcesToScale() error {
 
 		scaleEventDebounceDuration := as.getMaxScaleResourceWindowSize(resource)
 
-		// if the resource was scaled from zero or started, and the debounce period from then has not passed yet do not scale
+		// if the resource was scaled from zero or updated, and the debounce period from then has not passed yet do not scale
 		if ((resource.LastScaleEvent != nil) &&
-			(*resource.LastScaleEvent == scaler_types.ResourceStartedScaleEvent ||
+			(*resource.LastScaleEvent == scaler_types.ResourceUpdatedScaleEvent ||
 				*resource.LastScaleEvent == scaler_types.ScaleFromZeroStartedScaleEvent ||
 				*resource.LastScaleEvent == scaler_types.ScaleFromZeroCompletedScaleEvent)) &&
 			resource.LastScaleEventTime.After(now.Add(-1*scaleEventDebounceDuration)) {

pkg/dlx/dlx.go

@@ -17,7 +17,7 @@ type DLX struct {
 func NewDLX(logger logger.Logger,
 	resourceScaler scaler_types.ResourceScaler,
 	options scaler_types.DLXOptions) (*DLX, error) {
-	resourceStarter, err := NewResourceStarter(logger, resourceScaler, options.Namespace)
+	resourceStarter, err := NewResourceStarter(logger, resourceScaler, options.Namespace, options.ResourceReadinessTimeout)
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to create function starter")
 	}

pkg/dlx/resourcestarter.go

@@ -30,12 +30,13 @@ type ResourceStatusResult struct {
 
 func NewResourceStarter(parentLogger logger.Logger,
 	scaler scaler_types.ResourceScaler,
-	namespace string) (*ResourceStarter, error) {
+	namespace string,
+	resourceReadinessTimeout time.Duration) (*ResourceStarter, error) {
 	fs := &ResourceStarter{
 		logger:                   parentLogger.GetChild("resource-starter"),
 		resourceSinksMap:         make(resourceSinksMap),
 		namespace:                namespace,
-		resourceReadinessTimeout: time.Minute,
+		resourceReadinessTimeout: resourceReadinessTimeout,
 		scaler:                   scaler,
 	}
 	return fs, nil