diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-09 09:00:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-09 09:00:01 +0000 |
| commit | e0ebb7130f252e8f359aab3d9e23856c5f12ae05 (patch) | |
| tree | 2403b7feb8db783ad36ac59b0311e1240c2d912a | |
| parent | b7e8046fdbddf6eb858fd26c5e14c78de79d07e1 (diff) | |
| parent | 04b66db74e5ef76880c3b66cc674dfa1d32e05a0 (diff) | |
| download | ceilometer-e0ebb7130f252e8f359aab3d9e23856c5f12ae05.tar.gz | |
Merge "fix the value of query_spec.maxSample to advoid to be zero" into stable/icehouse
| -rw-r--r-- | ceilometer/compute/virt/vmware/vsphere_operations.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ceilometer/compute/virt/vmware/vsphere_operations.py b/ceilometer/compute/virt/vmware/vsphere_operations.py index 77f00adb..666cacba 100644 --- a/ceilometer/compute/virt/vmware/vsphere_operations.py +++ b/ceilometer/compute/virt/vmware/vsphere_operations.py @@ -205,7 +205,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 |