dfcd0dd7c4
When using ImagePollster to poll image status from Glance, there might
be duplicate image status event recorded down if there are private
images together with public images stored in Glance.
In Glance, the get image list API looks like:
def _get_images(self, context, filters, **params):
...
# NOTE(markwash): for backwards compatibility, is_public=True for
# admins actually means "treat me as if I'm not an admin and show
# all my images"
if context.is_admin and params.get('is_public') is True:
context.is_admin = False
del params['is_public']
...
The above code shows that if a user is of 'admin_role'(this option is
configured in the glance-api.conf) and querying for public images,
Glance will return all the public images together with the private
ones
While in ceilometer/image/glance.py#_Base.iter_images method,
ceilometer get the image list by querying public and private images
respectively and then chain the result lists together. This causes
the duplication of image in the image list.
This fix changes the code in ImagePollster.get_counters method to
filter out the duplicate images based on their image id.
Change-Id: Ib5e213161043033c20195efc0c6e7edd78982bd6
Fixes: Bug 1180630
126 lines
4.4 KiB
Python
126 lines
4.4 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2012 New Dream Network, LLC (DreamHost)
|
|
#
|
|
# Author: Julien Danjou <julien@danjou.info>
|
|
#
|
|
# 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.
|
|
"""Common code for working with images
|
|
"""
|
|
|
|
from __future__ import absolute_import
|
|
|
|
import itertools
|
|
import glanceclient
|
|
|
|
from ceilometer import counter
|
|
from ceilometer.openstack.common import timeutils
|
|
from ceilometer import plugin
|
|
|
|
|
|
class _Base(plugin.PollsterBase):
|
|
|
|
@staticmethod
|
|
def get_glance_client(ksclient):
|
|
endpoint = ksclient.service_catalog.url_for(
|
|
service_type='image',
|
|
endpoint_type='internalURL')
|
|
|
|
# hard-code v1 glance API version selection while v2 API matures
|
|
return glanceclient.Client('1', endpoint,
|
|
token=ksclient.auth_token)
|
|
|
|
def iter_images(self, ksclient):
|
|
"""Iterate over all images."""
|
|
client = self.get_glance_client(ksclient)
|
|
#TODO(eglynn): use pagination to protect against unbounded
|
|
# memory usage
|
|
rawImageList = list(itertools.chain(
|
|
client.images.list(filters={"is_public": True}),
|
|
#TODO(eglynn): extend glance API with all_tenants logic to
|
|
# avoid second call to retrieve private images
|
|
client.images.list(filters={"is_public": False})))
|
|
|
|
# When retrieving images from glance, glance will check
|
|
# whether the user is of 'admin_role' which is
|
|
# configured in glance-api.conf. If the user is of
|
|
# admin_role, and is querying public images(which means
|
|
# that the 'is_public' param is set to be True),
|
|
# glance will ignore 'is_public' parameter and returns
|
|
# all the public images together with private images.
|
|
# As a result, if the user/tenant has an admin role
|
|
# for ceilometer to collect image list,
|
|
# the _Base.iter_images method will return a image list
|
|
# which contains duplicate images. Add the following
|
|
# code to avoid recording down duplicate image events.
|
|
imageIdSet = set(image.id for image in rawImageList)
|
|
|
|
for image in rawImageList:
|
|
if image.id in imageIdSet:
|
|
imageIdSet -= set([image.id])
|
|
yield image
|
|
|
|
@staticmethod
|
|
def extract_image_metadata(image):
|
|
return dict((k, getattr(image, k))
|
|
for k in
|
|
[
|
|
"status",
|
|
"is_public",
|
|
"name",
|
|
"deleted",
|
|
"container_format",
|
|
"created_at",
|
|
"disk_format",
|
|
"updated_at",
|
|
"properties",
|
|
"min_disk",
|
|
"protected",
|
|
"checksum",
|
|
"deleted_at",
|
|
"min_ram",
|
|
"size",
|
|
])
|
|
|
|
|
|
class ImagePollster(_Base):
|
|
|
|
@staticmethod
|
|
def get_counter_names():
|
|
return ['image', 'image.size']
|
|
|
|
def get_counters(self, manager):
|
|
for image in self.iter_images(manager.keystone):
|
|
yield counter.Counter(
|
|
name='image',
|
|
type=counter.TYPE_GAUGE,
|
|
unit='image',
|
|
volume=1,
|
|
user_id=None,
|
|
project_id=image.owner,
|
|
resource_id=image.id,
|
|
timestamp=timeutils.isotime(),
|
|
resource_metadata=self.extract_image_metadata(image),
|
|
)
|
|
yield counter.Counter(
|
|
name='image.size',
|
|
type=counter.TYPE_GAUGE,
|
|
unit='B',
|
|
volume=image.size,
|
|
user_id=None,
|
|
project_id=image.owner,
|
|
resource_id=image.id,
|
|
timestamp=timeutils.isotime(),
|
|
resource_metadata=self.extract_image_metadata(image),
|
|
)
|