openstack/aodh
Code Issues Proposed changes

hbase: do not register table_prefix as a global option

Browse Source 
Rather use a per-connection option.

Change-Id: I53e26f72d9a7fb0e2778402801a71c2682883452
This commit is contained in:
Julien Danjou 2013-07-17 16:39:05 +02:00
parent dbe5f363bc
commit 46e673f9fb
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ceilometer/storage/impl_hbase.py
View File

@ -19,7 +19,6 @@
"""HBase storage backend """HBase storage backend
""" """
from sets import Set from sets import Set
from urlparse import urlparse
import json import json
import hashlib import hashlib
import copy import copy
@ -27,10 +26,11 @@ import datetime
import happybase import happybase
import os import os
import re import re
from oslo.config import cfg import urlparse
from ceilometer.openstack.common import log from ceilometer.openstack.common import log
from ceilometer.openstack.common import timeutils from ceilometer.openstack.common import timeutils
from ceilometer.openstack.common import network_utils
from ceilometer.storage import base from ceilometer.storage import base
from ceilometer.storage import models from ceilometer.storage import models
@ -63,17 +63,10 @@ class HBaseStorage(base.StorageEngine):
} }
""" """
OPTIONS = [
cfg.StrOpt('table_prefix',
default=None,
help='Database table prefix',
),
]
def register_opts(self, conf): def register_opts(self, conf):
"""Register any configuration options used by this engine. """Register any configuration options used by this engine.
""" """
conf.register_opts(self.OPTIONS) pass
@staticmethod @staticmethod
def get_connection(conf): def get_connection(conf):
@ -96,7 +89,6 @@ class Connection(base.Connection):
def __init__(self, conf): def __init__(self, conf):
"""Hbase Connection Initialization.""" """Hbase Connection Initialization."""
opts = self._parse_connection_url(conf.database.connection) opts = self._parse_connection_url(conf.database.connection)
opts['table_prefix'] = conf.table_prefix
if opts['host'] == '__test__': if opts['host'] == '__test__':
url = os.environ.get('CEILOMETER_TEST_HBASE_URL') url = os.environ.get('CEILOMETER_TEST_HBASE_URL')
@ -159,7 +151,9 @@ class Connection(base.Connection):
database name, so we are not looking for these in the url. database name, so we are not looking for these in the url.
""" """
opts = {} opts = {}
result = urlparse(url) result = network_utils.urlsplit(url)
opts['table_prefix'] = urlparse.parse_qs(
result.query).get('table_prefix', [None])[0]
opts['dbtype'] = result.scheme opts['dbtype'] = result.scheme
if ':' in result.netloc: if ':' in result.netloc:
opts['host'], port = result.netloc.split(':') opts['host'], port = result.netloc.split(':')