From 53fe9976cc48c3c301b74044bae6c23b8dbb1d63 Mon Sep 17 00:00:00 2001 From: yanheven Date: Thu, 29 Jan 2015 10:18:09 +0800 Subject: [PATCH] fix the value of query_spec.maxSample to advoid to be zero code before: VC_REAL_TIME_SAMPLING_INTERVAL = 20 samples_cnt = (int(duration / VC_REAL_TIME_SAMPLING_INTERVAL) if duration else 1) query_spec.maxSample = samples_cnt if we set the value of "interval" in /etc/ceilometer/pipline.yaml to less than 20,the value of "query_spec.maxSample" will be 0,which will cause problem when use it to send request to vsphere server Change-Id: Ibdb586109fe5334f3080539a40ff92badead837b Closes-Bug:#1415307 --- ceilometer/compute/virt/vmware/vsphere_operations.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ceilometer/compute/virt/vmware/vsphere_operations.py b/ceilometer/compute/virt/vmware/vsphere_operations.py index 2531e1af..ed5c2e02 100644 --- a/ceilometer/compute/virt/vmware/vsphere_operations.py +++ b/ceilometer/compute/virt/vmware/vsphere_operations.py @@ -206,7 +206,8 @@ class VsphereOperations(object): query_spec.intervalId = VC_REAL_TIME_SAMPLING_INTERVAL # We query all samples which are applicable over the specified duration samples_cnt = (int(duration / VC_REAL_TIME_SAMPLING_INTERVAL) - if duration else 1) + if duration and + duration >= VC_REAL_TIME_SAMPLING_INTERVAL else 1) query_spec.maxSample = samples_cnt perf_manager = session.vim.service_content.perfManager