openstack
/
deb-cinder
Code Issues Proposed changes

Merge "Fix host check in is_backend_frozen"

This commit is contained in:
Jenkins 2017-05-03 21:04:40 +00:00 committed by Gerrit Code Review
parent c088436abb 66efc6c8d9
commit 6d6a4e8bba
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/db/sqlalchemy/api.py
View File

@ -60,6 +60,7 @@ from cinder import exception
from cinder.i18n import _
from cinder.objects import fields
from cinder import utils
from cinder.volume import utils as vol_utils
CONF = cfg.CONF
@ -575,10 +576,10 @@ def is_backend_frozen(context, host, cluster_name):
"""Check if a storage backend is frozen based on host and cluster_name."""
if cluster_name:
model = models.Cluster
conditions = [model.name == cluster_name]
conditions = [model.name == vol_utils.extract_host(cluster_name)]
else:
model = models.Service
conditions = [model.host == host]
conditions = [model.host == vol_utils.extract_host(host)]
conditions.extend((~model.deleted, model.frozen))
query = get_session().query(sql.exists().where(and_(*conditions)))
frozen = query.scalar()

24
cinder/tests/unit/test_db_api.py
View File

@ -2947,16 +2947,21 @@ class DBAPIGenericTestCase(BaseTest):
@ddt.ddt
class DBAPIBackendTestCase(BaseTest):
@ddt.data(True, False)
def test_is_backend_frozen_service(self, frozen):
@ddt.data((True, True), (True, False), (False, True), (False, False))
@ddt.unpack
def test_is_backend_frozen_service(self, frozen, pool):
service = utils.create_service(self.ctxt, {'frozen': frozen})
utils.create_service(self.ctxt, {'host': service.host + '2',
'frozen': not frozen})
self.assertEqual(frozen, db.is_backend_frozen(self.ctxt, service.host,
host = service.host
if pool:
host += '#poolname'
self.assertEqual(frozen, db.is_backend_frozen(self.ctxt, host,
service.cluster_name))
@ddt.data(True, False)
def test_is_backend_frozen_cluster(self, frozen):
@ddt.data((True, True), (True, False), (False, True), (False, False))
@ddt.unpack
def test_is_backend_frozen_cluster(self, frozen, pool):
cluster = utils.create_cluster(self.ctxt, frozen=frozen)
utils.create_service(self.ctxt, {'frozen': frozen, 'host': 'hostA',
'cluster_name': cluster.name})
@ -2966,5 +2971,10 @@ class DBAPIBackendTestCase(BaseTest):
'cluster_name': cluster.name})
utils.create_populated_cluster(self.ctxt, 3, 0, frozen=not frozen,
name=cluster.name + '2')
self.assertEqual(frozen, db.is_backend_frozen(self.ctxt, service.host,
service.cluster_name))
host = service.host
cluster = service.cluster_name
if pool:
host += '#poolname'
cluster += '#poolname'
self.assertEqual(frozen,
db.is_backend_frozen(self.ctxt, host, cluster))