7aeefa0e99
Updates the CPU/Net/Disk compute pollsters so we handle instance not found exceptions. These types of exceptions may occur when an instance has been deleted during sample processing. Fixes LP Bug #1223098. Change-Id: Icc8a79f8c23276b68aa27e758872ff80ad484061
55 lines
2.0 KiB
Python
55 lines
2.0 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2012 eNovance <licensing@enovance.com>
|
|
# Copyright © 2012 Red Hat, Inc
|
|
#
|
|
# Author: Julien Danjou <julien@danjou.info>
|
|
# Author: Eoghan Glynn <eglynn@redhat.com>
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from ceilometer import sample
|
|
from ceilometer.compute import plugin
|
|
from ceilometer.compute.pollsters import util
|
|
from ceilometer.compute.virt import inspector as virt_inspector
|
|
from ceilometer.openstack.common import log
|
|
|
|
LOG = log.getLogger(__name__)
|
|
|
|
|
|
class CPUPollster(plugin.ComputePollster):
|
|
|
|
def get_samples(self, manager, cache, instance):
|
|
LOG.info('checking instance %s', instance.id)
|
|
instance_name = util.instance_name(instance)
|
|
try:
|
|
cpu_info = manager.inspector.inspect_cpus(instance_name)
|
|
LOG.info("CPUTIME USAGE: %s %d",
|
|
instance.__dict__, cpu_info.time)
|
|
cpu_num = {'cpu_number': cpu_info.number}
|
|
yield util.make_sample_from_instance(
|
|
instance,
|
|
name='cpu',
|
|
type=sample.TYPE_CUMULATIVE,
|
|
unit='ns',
|
|
volume=cpu_info.time,
|
|
additional_metadata=cpu_num,
|
|
)
|
|
except virt_inspector.InstanceNotFoundException as err:
|
|
# Instance was deleted while getting samples. Ignore it.
|
|
LOG.debug('Exception while getting samples %s', err)
|
|
except Exception as err:
|
|
LOG.error('could not get CPU time for %s: %s',
|
|
instance.id, err)
|
|
LOG.exception(err)
|