Fix Webhook discovery, refresh pool before getting pool size

CHANGELOG_PENDING.md

@@ -11,6 +11,7 @@
 
 #### Broadcaster
 - \#2392 Add LP_EXTEND_TIMEOUTS env variable to extend timeouts for Stream Tester (@leszko)
+- \#2413 Fix Webhook discovery, refresh pool before getting pool size (@leszko)
 
 #### Orchestrator
 

cmd/livepeer/livepeer.go

@@ -50,7 +50,7 @@ func main() {
 	}
 
 	vFlag.Value.Set(*verbosity)
-	extendTimeouts()
+	streamTesterMode()
 
 	cfg = updateNilsForUnsetFlags(cfg)
 
@@ -202,14 +202,17 @@ func updateNilsForUnsetFlags(cfg starter.LivepeerConfig) starter.LivepeerConfig
 	return res
 }
 
-// extendTimeouts extends transcoding timeouts for the testing purpose.
+// streamTesterMode extends transcoding timeouts and disable caching for the testing purpose.
 // This functionality is intended for Stream Tester to avoid timing out while measuring orchestrator performance.
-func extendTimeouts() {
-	if boolVal, _ := strconv.ParseBool(os.Getenv("LP_EXTEND_TIMEOUTS")); boolVal {
+func streamTesterMode() {
+	if boolVal, _ := strconv.ParseBool(os.Getenv("LP_IS_ORCH_TESTER")); boolVal {
 		// Make all timeouts 8s for the common segment durations
 		common.SegUploadTimeoutMultiplier = 4.0
 		common.SegmentUploadTimeout = 8 * time.Second
 		common.HTTPDialTimeout = 8 * time.Second
 		common.SegHttpPushTimeoutMultiplier = 4.0
+
+		// Disable caching for Orchestrator Discovery Webhook
+		common.WebhookDiscoveryRefreshInterval = 0
 	}
 }

common/util.go

@@ -41,6 +41,9 @@ var SegUploadTimeoutMultiplier = 0.5
 // SegmentUploadTimeout timeout used in HTTP connections for uploading the segment duration is not defined
 var SegmentUploadTimeout = 2 * time.Second
 
+// WebhookDiscoveryRefreshInterval defines for long the Webhook Discovery values should be cached
+var WebhookDiscoveryRefreshInterval = 1 * time.Minute
+
 // Max Segment Duration
 var MaxDuration = (5 * time.Minute)
 

discovery/wh_discovery.go

@@ -17,8 +17,6 @@ import (
 	"github.com/golang/glog"
 )
 
-var whRefreshInterval = 1 * time.Minute
-
 type webhookResponse struct {
 	Address string  `json:"address,omitempty"`
 	Score   float32 `json:"score,omitempty"`
@@ -50,7 +48,7 @@ func (w *webhookPool) getInfos() ([]common.OrchestratorLocalInfo, error) {
 	w.mu.RUnlock()
 
 	// retrive addrs from cache if time since lastRequest is less than the refresh interval
-	if time.Since(lastReq) < whRefreshInterval {
+	if time.Since(lastReq) < common.WebhookDiscoveryRefreshInterval {
 		return pool.GetInfos(), nil
 	}
 
@@ -100,6 +98,9 @@ func (w *webhookPool) Size() int {
 }
 
 func (w *webhookPool) SizeWith(scorePred common.ScorePred) int {
+	// Refresh pool
+	w.GetInfos()
+
 	var size int
 	w.mu.RLock()
 	if w.pool != nil {