Skip to content

Commit 64b288d

Browse files
authored
Fetch all entries when listing assigned producers (#5373)
This works around a confusing interface in Progenitor, which lists the second argument to the `*_stream()` methods as a `limit`, but which describes it as a page size. It currently is the former, a total limit on all entries, so this change ensures we refresh our producer entire producer list.
1 parent bb26b0a commit 64b288d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

oximeter/collector/src/agent.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ use std::collections::btree_map::Entry;
3636
use std::collections::BTreeMap;
3737
use std::net::SocketAddr;
3838
use std::net::SocketAddrV6;
39-
use std::num::NonZeroU32;
4039
use std::ops::Bound;
4140
use std::sync::Arc;
4241
use std::sync::Mutex as StdMutex;
@@ -748,7 +747,6 @@ impl OximeterAgent {
748747
// A task which periodically updates our list of producers from Nexus.
749748
async fn refresh_producer_list(agent: OximeterAgent, resolver: Resolver) {
750749
let mut interval = tokio::time::interval(agent.refresh_interval);
751-
let page_size = Some(NonZeroU32::new(100).unwrap());
752750
loop {
753751
interval.tick().await;
754752
info!(agent.log, "refreshing list of producers from Nexus");
@@ -758,7 +756,9 @@ async fn refresh_producer_list(agent: OximeterAgent, resolver: Resolver) {
758756
let client = nexus_client::Client::new(&url, agent.log.clone());
759757
let mut stream = client.cpapi_assigned_producers_list_stream(
760758
&agent.id,
761-
page_size,
759+
// This is a _total_ limit, not a page size, so `None` means "get
760+
// all entries".
761+
None,
762762
Some(IdSortMode::IdAscending),
763763
);
764764
let mut expected_producers = BTreeMap::new();

0 commit comments

Comments
 (0)