Move the capacity reporting into db_discovery #3778
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,34 +14,33 @@ import ( | |
| "github.com/livepeer/go-livepeer/core" | ||
| "github.com/livepeer/go-livepeer/eth" | ||
| lpTypes "github.com/livepeer/go-livepeer/eth/types" | ||
| "github.com/livepeer/go-livepeer/monitor" | ||
| "github.com/livepeer/go-livepeer/net" | ||
| "github.com/livepeer/go-livepeer/pm" | ||
| "github.com/livepeer/go-livepeer/server" | ||
|
|
||
| "github.com/golang/glog" | ||
| ) | ||
|
|
||
| var networkCapabilitiesReportingInterval = 25 * time.Minute | ||
|
|
||
| type ticketParamsValidator interface { | ||
| ValidateTicketParams(ticketParams *pm.TicketParams) error | ||
| } | ||
|
|
||
| type DBOrchestratorPoolCache struct { | ||
| store common.OrchestratorStore | ||
| lpEth eth.LivepeerEthClient | ||
| ticketParamsValidator ticketParamsValidator | ||
| rm common.RoundsManager | ||
| bcast common.Broadcaster | ||
| orchBlacklist []string | ||
| discoveryTimeout time.Duration | ||
| node *core.LivepeerNode | ||
| lastNetworkCapabilitiesReported time.Time | ||
| } | ||
|
|
||
| func NewDBOrchestratorPoolCache(ctx context.Context, node *core.LivepeerNode, rm common.RoundsManager, orchBlacklist []string, discoveryTimeout time.Duration, liveAICapReportInterval time.Duration) (*DBOrchestratorPoolCache, error) { | ||
| if node.Eth == nil { | ||
| return nil, fmt.Errorf("could not create DBOrchestratorPoolCache: LivepeerEthClient is nil") | ||
| } | ||
|
|
@@ -66,7 +65,7 @@ func NewDBOrchestratorPoolCache(ctx context.Context, node *core.LivepeerNode, rm | |
| return err | ||
| } | ||
|
|
||
| if err := dbo.pollOrchestratorInfo(ctx, liveAICapReportInterval); err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
|
|
@@ -252,13 +251,13 @@ func (dbo *DBOrchestratorPoolCache) cacheOrchestratorStake() error { | |
| return nil | ||
| } | ||
|
|
||
| func (dbo *DBOrchestratorPoolCache) pollOrchestratorInfo(ctx context.Context, liveAICapReportInterval time.Duration) error { | ||
| if err := dbo.cacheOrchInfos(); err != nil { | ||
| glog.Errorf("unable to poll orchestrator info: %v", err) | ||
| return err | ||
| } | ||
|
|
||
| ticker := time.NewTicker(liveAICapReportInterval) | ||
| go func() { | ||
| for { | ||
| select { | ||
|
|
@@ -393,12 +392,59 @@ func (dbo *DBOrchestratorPoolCache) cacheOrchInfos() error { | |
| i = numOrchs //exit loop | ||
| } | ||
| } | ||
|
|
||
| // Only update network capabilities every 25 minutes | ||
| if time.Since(dbo.lastNetworkCapabilitiesReported) >= networkCapabilitiesReportingInterval { | ||
| // Save network capabilities in LivepeerNode | ||
| dbo.node.UpdateNetworkCapabilities(orchNetworkCapabilities) | ||
|
|
||
| dbo.lastNetworkCapabilitiesReported = time.Now() | ||
| } | ||
|
Comment on lines
+396
to
+402
There was a problem hiding this comment. Why don't we always send network capabilities? There was a problem hiding this comment. I wanted to leave the existing behaviour alone, so only sending to kafka every 25 mins, wdyt @ad-astra-video ? Going from 25 mins to 10 seconds seems wrong :) |
||
|
|
||
| // Report AI container capacity metrics | ||
| reportAICapacityFromNetworkCapabilities(orchNetworkCapabilities) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func reportAICapacityFromNetworkCapabilities(orchNetworkCapabilities []*common.OrchNetworkCapabilities) { | ||
| // Build structured capacity data | ||
| modelCapacities := make(map[string]*monitor.ModelAICapacities) | ||
|
|
||
| for _, orchCap := range orchNetworkCapabilities { | ||
| models := getModelCapsFromNetCapabilities(orchCap.Capabilities) | ||
|
|
||
| for modelID, model := range models { | ||
| if _, exists := modelCapacities[modelID]; !exists { | ||
| modelCapacities[modelID] = &monitor.ModelAICapacities{ | ||
| ModelID: modelID, | ||
| Orchestrators: make(map[string]monitor.AIContainerCapacity), | ||
| } | ||
| } | ||
|
|
||
| capacity := monitor.AIContainerCapacity{ | ||
| Idle: int(model.Capacity), | ||
| InUse: int(model.CapacityInUse), | ||
| } | ||
| modelCapacities[modelID].Orchestrators[orchCap.OrchURI] = capacity | ||
| } | ||
| } | ||
|
|
||
| monitor.ReportAIContainerCapacity(modelCapacities) | ||
| } | ||
|
|
||
| func getModelCapsFromNetCapabilities(caps *net.Capabilities) map[string]*net.Capabilities_CapabilityConstraints_ModelConstraint { | ||
| if caps == nil || caps.Constraints == nil || caps.Constraints.PerCapability == nil { | ||
| return nil | ||
| } | ||
| liveAI, ok := caps.Constraints.PerCapability[uint32(core.Capability_LiveVideoToVideo)] | ||
| if !ok { | ||
| return nil | ||
| } | ||
|
|
||
| return liveAI.Models | ||
| } | ||
|
|
||
| func (dbo *DBOrchestratorPoolCache) Broadcaster() common.Broadcaster { | ||
| return dbo.bcast | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a note that we need to be careful with deploying this change because if we have this flag configured in infra the gateway will fail to start because the flag does not exist anymore.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah it's a pain, i guess maybe i could leave it in but not use it, then come along after the prod deploy and remove it