openstack/gnocchi
Code Issues Proposed changes

swift: optimize metric reporting in detail mode

Browse Source 
This only makes one listing request if details are requested.

Change-Id: If637230b1d8913f1574f15dc9e93a5ecdac54fad
This commit is contained in:
Julien Danjou 2016-08-09 20:12:23 +02:00
parent 9bc426d901
commit 4390238970
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnocchi/storage/swift.py
View File

@ -121,19 +121,23 @@ class SwiftStorage(_carbonara.CarbonaraBasedStorage):
data)
def _build_report(self, details):
headers, files = self.swift.get_container(self.MEASURE_PREFIX,
delimiter='/',
full_listing=True)
metrics = len(files)
measures = int(headers.get('x-container-object-count'))
metric_details = defaultdict(int)
if details:
headers, files = self.swift.get_container(self.MEASURE_PREFIX,
full_listing=True)
metrics = set()
for f in files:
metric = f['name'].split('/', 1)[0]
metric, metric_files = f['name'].split("/", 1)
metric_details[metric] += 1
return metrics, measures, metric_details if details else None
metrics.add(metric)
nb_metrics = len(metrics)
else:
headers, files = self.swift.get_container(self.MEASURE_PREFIX,
delimiter='/',
full_listing=True)
nb_metrics = len(files)
measures = int(headers.get('x-container-object-count'))
return nb_metrics, measures, metric_details if details else None
def list_metric_with_measures_to_process(self, size, part, full=False):
limit = None