bd0244ffe6
Currently, we generate lots of samples by polling data from other services, but theses rest requests have no timeout limitation. We have observed that some requests (for example, keystone due to openssl problem) may stuck for over several days (maybe forever if we don't restart the service). Other pollsters in same thread will not be able to work too. The worst thing is that, when outside (keystone) service becomes normal, Ceilometer cannot recover itself automatically, cloud operator needs to restart it manually. So I strongly suggest that we should add timeout limit to **every** rest api call, this is quite important to improve Ceilometer's robust and reliability. This patch adds a new option named http_timeout, and applies it to almost all http requests in Ceilometer project. Change-Id: I76df2c0a9ffacb252e15edbb125e37ccb2aac4aa Closes-Bug: #1388778
134 lines
3.7 KiB
Python
134 lines
3.7 KiB
Python
# Copyright (C) 2014 eNovance SAS <licensing@enovance.com>
|
|
#
|
|
# Author: Sylvain Afchain <sylvain.afchain@enovance.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.
|
|
|
|
import functools
|
|
|
|
from neutronclient.common import exceptions
|
|
from neutronclient.v2_0 import client as clientv20
|
|
from oslo.config import cfg
|
|
|
|
from ceilometer.openstack.common import log
|
|
|
|
|
|
SERVICE_OPTS = [
|
|
cfg.StrOpt('neutron',
|
|
default='network',
|
|
help='Neutron service type.'),
|
|
]
|
|
|
|
cfg.CONF.register_opts(SERVICE_OPTS, group='service_types')
|
|
cfg.CONF.import_opt('http_timeout', 'ceilometer.service')
|
|
cfg.CONF.import_group('service_credentials', 'ceilometer.service')
|
|
|
|
LOG = log.getLogger(__name__)
|
|
|
|
|
|
def logged(func):
|
|
|
|
@functools.wraps(func)
|
|
def with_logging(*args, **kwargs):
|
|
try:
|
|
return func(*args, **kwargs)
|
|
except exceptions.NeutronClientException as e:
|
|
# handles 404's when services are disabled in neutron
|
|
LOG.warn(e)
|
|
return []
|
|
except Exception as e:
|
|
LOG.exception(e)
|
|
raise
|
|
|
|
return with_logging
|
|
|
|
|
|
class Client(object):
|
|
"""A client which gets information via python-neutronclient."""
|
|
|
|
def __init__(self):
|
|
conf = cfg.CONF.service_credentials
|
|
params = {
|
|
'insecure': conf.insecure,
|
|
'ca_cert': conf.os_cacert,
|
|
'username': conf.os_username,
|
|
'password': conf.os_password,
|
|
'auth_url': conf.os_auth_url,
|
|
'region_name': conf.os_region_name,
|
|
'endpoint_type': conf.os_endpoint_type,
|
|
'timeout': cfg.CONF.http_timeout,
|
|
'service_type': cfg.CONF.service_types.neutron,
|
|
}
|
|
|
|
if conf.os_tenant_id:
|
|
params['tenant_id'] = conf.os_tenant_id
|
|
else:
|
|
params['tenant_name'] = conf.os_tenant_name
|
|
|
|
self.client = clientv20.Client(**params)
|
|
|
|
@logged
|
|
def network_get_all(self):
|
|
"""Returns all networks."""
|
|
resp = self.client.list_networks()
|
|
return resp.get('networks')
|
|
|
|
@logged
|
|
def port_get_all(self):
|
|
resp = self.client.list_ports()
|
|
return resp.get('ports')
|
|
|
|
@logged
|
|
def vip_get_all(self):
|
|
resp = self.client.list_vips()
|
|
return resp.get('vips')
|
|
|
|
@logged
|
|
def pool_get_all(self):
|
|
resp = self.client.list_pools()
|
|
return resp.get('pools')
|
|
|
|
@logged
|
|
def member_get_all(self):
|
|
resp = self.client.list_members()
|
|
return resp.get('members')
|
|
|
|
@logged
|
|
def health_monitor_get_all(self):
|
|
resp = self.client.list_health_monitors()
|
|
return resp.get('health_monitors')
|
|
|
|
@logged
|
|
def pool_stats(self, pool):
|
|
return self.client.retrieve_pool_stats(pool)
|
|
|
|
@logged
|
|
def vpn_get_all(self):
|
|
resp = self.client.list_vpnservices()
|
|
return resp.get('vpnservices')
|
|
|
|
@logged
|
|
def ipsec_site_connections_get_all(self):
|
|
resp = self.client.list_ipsec_site_connections()
|
|
return resp.get('ipsec_site_connections')
|
|
|
|
@logged
|
|
def firewall_get_all(self):
|
|
resp = self.client.list_firewalls()
|
|
return resp.get('firewalls')
|
|
|
|
@logged
|
|
def fw_policy_get_all(self):
|
|
resp = self.client.list_firewall_policies()
|
|
return resp.get('firewall_policies')
|