Skip to content

Add caching of aggregates #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 31, 2023
Merged

Add caching of aggregates #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5edc200
Add cache todo
JohnGarbutt Mar 30, 2023
b7d97eb
Attempt to add caching
JohnGarbutt Mar 30, 2023
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
23 changes: 16 additions & 7 deletions os_capacity/prometheus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import prometheus_client as prom_client
from prometheus_client import core as prom_core

RESOURCE_PROVIDER_AGGREGATE_CACHE = {}


def get_capacity_per_flavor(placement_client, flavors):
capacity_per_flavor = {}
Expand Down Expand Up @@ -122,13 +124,20 @@ def get_resource_provider_info(compute_client, placement_client):
# skip checking every resource provider for their aggregates
continue

response = placement_client.get(
f"/resource_providers/{raw_rp.id}/aggregates",
headers={"OpenStack-API-Version": "placement 1.19"},
)
response.raise_for_status()
aggs = response.json()
rp["aggregates"] = aggs["aggregates"]
# TODO(johngarbutt): maybe check if cached aggregate still exists?
aggregates = RESOURCE_PROVIDER_AGGREGATE_CACHE.get(raw_rp.id)
if aggregates is None:
response = placement_client.get(
f"/resource_providers/{raw_rp.id}/aggregates",
headers={"OpenStack-API-Version": "placement 1.19"},
)
response.raise_for_status()
aggs = response.json()
rp["aggregates"] = aggs["aggregates"]
RESOURCE_PROVIDER_AGGREGATE_CACHE[raw_rp.id] = aggs["aggregates"]
else:
rp["aggregates"] = aggregates

for agg_id in rp["aggregates"]:
if agg_id in azones:
rp["az"] = azones[agg_id]
Expand Down