Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions common/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,5 @@ type OrchNetworkCapabilities struct {
PriceInfo *net.PriceInfo `json:"price_info"`
CapabilitiesPrices []*net.PriceInfo `json:"capabilities_prices"`
Hardware []*net.HardwareInformation `json:"hardware"`
DiscoveryTime *time.Duration `json:"discovery_time"`
}
8 changes: 6 additions & 2 deletions discovery/db_discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ func (dbo *DBOrchestratorPoolCache) cacheOrchInfos() error {
level int
orchInfo *net.OrchestratorInfo
dbOrch *common.DBOrch
latency time.Duration
}

nodesPerOrch := dbo.bcast.ExtraNodes()
Expand All @@ -367,6 +368,7 @@ func (dbo *DBOrchestratorPoolCache) cacheOrchInfos() error {
errc <- fmt.Errorf("skipping orch=%v, URI not set", orch.URL.String())
return
}
start := time.Now()
info, err := getOrchInfoRPC(ctx, dbo.bcast, uri, server.GetOrchestratorInfoParams{
IgnoreCapacityCheck: dbo.ignoreCapacityCheck,
})
Expand Down Expand Up @@ -411,6 +413,7 @@ func (dbo *DBOrchestratorPoolCache) cacheOrchInfos() error {
level: level,
orchInfo: info,
dbOrch: dbOrch,
latency: time.Since(start),
}
}

Expand Down Expand Up @@ -438,7 +441,7 @@ func (dbo *DBOrchestratorPoolCache) cacheOrchInfos() error {
select {
case res := <-resc:
//add response to network capabilities
orchNetworkCapabilities = append(orchNetworkCapabilities, orchInfoToOrchNetworkCapabilities(res.orchInfo))
orchNetworkCapabilities = append(orchNetworkCapabilities, orchInfoToOrchNetworkCapabilities(res.orchInfo, res.latency))

// discover newly advertised nodes. only recurse the first level.
if res.level == 0 && len(res.orchInfo.GetNodes()) > 0 {
Expand Down Expand Up @@ -578,7 +581,7 @@ func pmTicketParams(params *net.TicketParams) *pm.TicketParams {
}
}

func orchInfoToOrchNetworkCapabilities(info *net.OrchestratorInfo) *common.OrchNetworkCapabilities {
func orchInfoToOrchNetworkCapabilities(info *net.OrchestratorInfo, latency time.Duration) *common.OrchNetworkCapabilities {
var orch common.OrchNetworkCapabilities

// add orch operating information if available
Expand All @@ -593,6 +596,7 @@ func orchInfoToOrchNetworkCapabilities(info *net.OrchestratorInfo) *common.OrchN
orch.Address = string(ethcommon.BytesToAddress(info.TicketParams.Recipient).Hex())
}
}
orch.DiscoveryTime = &latency

return &orch
}
Loading