fn: cleanup of unused/global constants in lb agent (#1020)

Moved retry interval as placer member variable for time-being.

api/runnerpool/ch_placer.go

@@ -7,18 +7,21 @@ import (
 	"context"
 	"time"
 
-	"github.com/fnproject/fn/api/common"
 	"github.com/fnproject/fn/api/models"
 
 	"github.com/dchest/siphash"
 	"github.com/sirupsen/logrus"
 )
 
-type chPlacer struct{}
+type chPlacer struct {
+	rrInterval time.Duration
+}
 
 func NewCHPlacer() Placer {
 	logrus.Info("Creating new CH runnerpool placer")
-	return &chPlacer{}
+	return &chPlacer{
+		rrInterval: 10 * time.Millisecond,
+	}
 }
 
 // This borrows the CH placement algorithm from the original FNLB.
@@ -62,18 +65,13 @@ func (p *chPlacer) PlaceCall(rp RunnerPool, ctx context.Context, call RunnerCall
 			}
 		}
 
-		remaining := call.LbDeadline().Sub(time.Now())
-		if remaining <= 0 {
-			return models.ErrCallTimeoutServerBusy
-		}
-
 		// backoff
 		select {
 		case <-ctx.Done():
 			return models.ErrCallTimeoutServerBusy
 		case <-timeout:
 			return models.ErrCallTimeoutServerBusy
-		case <-time.After(common.MinDuration(retryWaitInterval, remaining)):
+		case <-time.After(p.rrInterval):
 		}
 	}
 }

api/runnerpool/naive_placer.go

@@ -5,26 +5,22 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/fnproject/fn/api/common"
 	"github.com/fnproject/fn/api/models"
 
 	"github.com/sirupsen/logrus"
 )
 
-const (
-	// sleep time to attempt placement across all runners before retrying
-	retryWaitInterval = 10 * time.Millisecond
-)
-
 type naivePlacer struct {
-	rrIndex uint64
+	rrInterval time.Duration
+	rrIndex    uint64
 }
 
 func NewNaivePlacer() Placer {
 	rrIndex := uint64(time.Now().Nanosecond())
 	logrus.Infof("Creating new naive runnerpool placer rrIndex=%d", rrIndex)
 	return &naivePlacer{
-		rrIndex: rrIndex,
+		rrInterval: 10 * time.Millisecond,
+		rrIndex:    rrIndex,
 	}
 }
 
@@ -62,18 +58,13 @@ func (sp *naivePlacer) PlaceCall(rp RunnerPool, ctx context.Context, call Runner
 			}
 		}
 
-		remaining := call.LbDeadline().Sub(time.Now())
-		if remaining <= 0 {
-			return models.ErrCallTimeoutServerBusy
-		}
-
 		// backoff
 		select {
 		case <-ctx.Done():
 			return models.ErrCallTimeoutServerBusy
 		case <-timeout:
 			return models.ErrCallTimeoutServerBusy
-		case <-time.After(common.MinDuration(retryWaitInterval, remaining)):
+		case <-time.After(sp.rrInterval):
 		}
 	}
 }