Peter Stachowski
51f2655770
In order to allow clusters to be all on the same hypervisor (affinity) or all on different hypervisors (anti-affinity) a new argument (locality) needed to be added to the Trove cluster-create API. This changeset addresses the Trove server part of this feature. 'locality' can now be added to the ReST payload for a cluster-create command and it is passed along as a scheduler hint to Nova. The cluster scenario tests were enhanced to test that 'affinity' works. Testing that 'anti-affinity' fails proved to be too time consuming, since at present the only way for a cluster to 'fail' is to timeout (and that takes 10 hours). The server-group is checked to make sure it is created properly, and that it has been deleted after all the related instances are gone. DocImpact: New functionality Partially implements: blueprint replication-cluster-locality Depends-On: Ie46cfa69ffe6a64760aca38c495563f5724bd0d0 Change-Id: I657bf5c023d0257e462cc39f57c16eb6ee83807a
274 lines
12 KiB
Python
274 lines
12 KiB
Python
# Copyright [2015] Hewlett-Packard Development Company, L.P.
|
|
# 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 uuid
|
|
|
|
from mock import Mock
|
|
from mock import patch
|
|
from novaclient import exceptions as nova_exceptions
|
|
from trove.cluster.models import Cluster
|
|
from trove.cluster.models import ClusterTasks
|
|
from trove.cluster.models import DBCluster
|
|
from trove.common import cfg
|
|
from trove.common import exception
|
|
from trove.common import remote
|
|
from trove.common.strategies.cluster.experimental.redis import api as redis_api
|
|
from trove.instance import models as inst_models
|
|
from trove.instance.models import DBInstance
|
|
from trove.instance.models import InstanceTasks
|
|
from trove.quota.quota import QUOTAS
|
|
from trove.taskmanager import api as task_api
|
|
from trove.tests.unittests import trove_testtools
|
|
|
|
CONF = cfg.CONF
|
|
|
|
|
|
class FakeOptGroup(object):
|
|
def __init__(self, cluster_member_count=3,
|
|
volume_support=True, device_path='/dev/vdb'):
|
|
self.cluster_member_count = cluster_member_count
|
|
self.volume_support = volume_support
|
|
self.device_path = device_path
|
|
|
|
|
|
class ClusterTest(trove_testtools.TestCase):
|
|
def setUp(self):
|
|
super(ClusterTest, self).setUp()
|
|
|
|
self.cluster_id = str(uuid.uuid4())
|
|
self.cluster_name = "Cluster" + self.cluster_id
|
|
self.tenant_id = "23423432"
|
|
self.dv_id = "1"
|
|
self.db_info = DBCluster(ClusterTasks.NONE,
|
|
id=self.cluster_id,
|
|
name=self.cluster_name,
|
|
tenant_id=self.tenant_id,
|
|
datastore_version_id=self.dv_id,
|
|
task_id=ClusterTasks.NONE._code)
|
|
|
|
self.get_client_patch = patch.object(task_api.API, 'get_client')
|
|
self.get_client_mock = self.get_client_patch.start()
|
|
self.addCleanup(self.get_client_patch.stop)
|
|
self.dbcreate_patch = patch.object(DBCluster, 'create',
|
|
return_value=self.db_info)
|
|
self.dbcreate_mock = self.dbcreate_patch.start()
|
|
self.addCleanup(self.dbcreate_patch.stop)
|
|
|
|
self.context = trove_testtools.TroveTestContext(self)
|
|
self.datastore = Mock()
|
|
self.dv = Mock()
|
|
self.dv.manager = "redis"
|
|
self.datastore_version = self.dv
|
|
self.cluster = redis_api.RedisCluster(self.context, self.db_info,
|
|
self.datastore,
|
|
self.datastore_version)
|
|
self.cluster._server_group_loaded = True
|
|
self.instances_w_volumes = [{'volume_size': 1,
|
|
'flavor_id': '1234'}] * 3
|
|
self.instances_no_volumes = [{'flavor_id': '1234'}] * 3
|
|
|
|
def tearDown(self):
|
|
super(ClusterTest, self).tearDown()
|
|
|
|
@patch.object(remote, 'create_nova_client')
|
|
def test_create_invalid_flavor_specified(self,
|
|
mock_client):
|
|
(mock_client.return_value.flavors.get) = Mock(
|
|
side_effect=nova_exceptions.NotFound(
|
|
404, "Flavor id not found %s" % id))
|
|
|
|
self.assertRaises(exception.FlavorNotFound,
|
|
Cluster.create,
|
|
Mock(),
|
|
self.cluster_name,
|
|
self.datastore,
|
|
self.datastore_version,
|
|
self.instances_w_volumes,
|
|
{}, None)
|
|
|
|
@patch.object(remote, 'create_nova_client')
|
|
@patch.object(redis_api, 'CONF')
|
|
def test_create_volume_no_specified(self, mock_conf, mock_client):
|
|
mock_conf.get = Mock(
|
|
return_value=FakeOptGroup(volume_support=True))
|
|
self.assertRaises(exception.VolumeSizeNotSpecified,
|
|
Cluster.create,
|
|
Mock(),
|
|
self.cluster_name,
|
|
self.datastore,
|
|
self.datastore_version,
|
|
self.instances_no_volumes,
|
|
{}, None)
|
|
|
|
@patch.object(remote, 'create_nova_client')
|
|
@patch.object(redis_api, 'CONF')
|
|
def test_create_storage_specified_with_no_volume_support(self,
|
|
mock_conf,
|
|
mock_client):
|
|
mock_conf.get = Mock(
|
|
return_value=FakeOptGroup(volume_support=False))
|
|
mock_client.return_value.flavors = Mock()
|
|
self.assertRaises(exception.VolumeNotSupported,
|
|
Cluster.create,
|
|
Mock(),
|
|
self.cluster_name,
|
|
self.datastore,
|
|
self.datastore_version,
|
|
self.instances_w_volumes,
|
|
{}, None)
|
|
|
|
@patch.object(remote, 'create_nova_client')
|
|
@patch.object(redis_api, 'CONF')
|
|
def test_create_storage_not_specified_and_no_ephemeral_flavor(self,
|
|
mock_conf,
|
|
mock_client):
|
|
class FakeFlavor:
|
|
def __init__(self, flavor_id):
|
|
self.flavor_id = flavor_id
|
|
|
|
@property
|
|
def id(self):
|
|
return self.flavor.id
|
|
|
|
@property
|
|
def ephemeral(self):
|
|
return 0
|
|
mock_conf.get = Mock(
|
|
return_value=FakeOptGroup(volume_support=False))
|
|
(mock_client.return_value.
|
|
flavors.get.return_value) = FakeFlavor('1234')
|
|
self.assertRaises(exception.LocalStorageNotSpecified,
|
|
Cluster.create,
|
|
Mock(),
|
|
self.cluster_name,
|
|
self.datastore,
|
|
self.datastore_version,
|
|
self.instances_no_volumes,
|
|
{}, None)
|
|
|
|
@patch.object(redis_api, 'CONF')
|
|
@patch.object(inst_models.Instance, 'create')
|
|
@patch.object(task_api, 'load')
|
|
@patch.object(QUOTAS, 'check_quotas')
|
|
@patch.object(remote, 'create_nova_client')
|
|
def test_create(self, mock_client, mock_check_quotas, mock_task_api,
|
|
mock_ins_create, mock_conf):
|
|
mock_conf.get = Mock(
|
|
return_value=FakeOptGroup(volume_support=True))
|
|
mock_client.return_value.flavors = Mock()
|
|
self.cluster.create(Mock(),
|
|
self.cluster_name,
|
|
self.datastore,
|
|
self.datastore_version,
|
|
self.instances_w_volumes, {}, None)
|
|
mock_task_api.return_value.create_cluster.assert_called_with(
|
|
self.dbcreate_mock.return_value.id)
|
|
self.assertEqual(3, mock_ins_create.call_count)
|
|
|
|
@patch.object(redis_api, 'CONF')
|
|
@patch.object(inst_models.Instance, 'create')
|
|
@patch.object(task_api, 'load')
|
|
@patch.object(QUOTAS, 'check_quotas')
|
|
@patch.object(remote, 'create_nova_client')
|
|
def test_create_with_ephemeral_flavor(self, mock_client, mock_check_quotas,
|
|
mock_task_api, mock_ins_create,
|
|
mock_conf):
|
|
class FakeFlavor:
|
|
def __init__(self, flavor_id):
|
|
self.flavor_id = flavor_id
|
|
|
|
@property
|
|
def id(self):
|
|
return self.flavor.id
|
|
|
|
@property
|
|
def ephemeral(self):
|
|
return 1
|
|
mock_conf.get = Mock(
|
|
return_value=FakeOptGroup(volume_support=False))
|
|
(mock_client.return_value.
|
|
flavors.get.return_value) = FakeFlavor('1234')
|
|
self.cluster.create(Mock(),
|
|
self.cluster_name,
|
|
self.datastore,
|
|
self.datastore_version,
|
|
self.instances_no_volumes, {}, None)
|
|
mock_task_api.return_value.create_cluster.assert_called_with(
|
|
self.dbcreate_mock.return_value.id)
|
|
self.assertEqual(3, mock_ins_create.call_count)
|
|
|
|
@patch.object(DBCluster, 'update')
|
|
@patch.object(redis_api, 'CONF')
|
|
@patch.object(inst_models.Instance, 'create')
|
|
@patch.object(task_api, 'load')
|
|
@patch.object(QUOTAS, 'check_quotas')
|
|
@patch.object(remote, 'create_nova_client')
|
|
def test_grow(self, mock_client, mock_check_quotas, mock_task_api,
|
|
mock_ins_create, mock_conf, mock_update):
|
|
mock_conf.get = Mock(
|
|
return_value=FakeOptGroup(volume_support=True))
|
|
mock_client.return_value.flavors = Mock()
|
|
self.cluster.grow(self.instances_w_volumes)
|
|
mock_task_api.return_value.grow_cluster.assert_called_with(
|
|
self.dbcreate_mock.return_value.id,
|
|
[mock_ins_create.return_value.id] * 3)
|
|
self.assertEqual(3, mock_ins_create.call_count)
|
|
|
|
@patch.object(DBInstance, 'find_all')
|
|
@patch.object(Cluster, 'get_guest')
|
|
@patch.object(DBCluster, 'update')
|
|
@patch.object(inst_models.Instance, 'load')
|
|
@patch.object(inst_models.Instance, 'delete')
|
|
def test_shrink(self,
|
|
mock_ins_delete, mock_ins_load, mock_update,
|
|
mock_guest, mock_find_all):
|
|
mock_find_all.return_value.all.return_value = [
|
|
DBInstance(InstanceTasks.NONE, id="1", name="member1",
|
|
compute_instance_id="compute-1",
|
|
task_id=InstanceTasks.NONE._code,
|
|
task_description=InstanceTasks.NONE._db_text,
|
|
volume_id="volume-1",
|
|
datastore_version_id="1",
|
|
cluster_id=self.cluster_id,
|
|
type="member")]
|
|
self.cluster.shrink(['id1'])
|
|
self.assertEqual(1, mock_ins_delete.call_count)
|
|
|
|
@patch('trove.cluster.models.LOG')
|
|
def test_delete_bad_task_status(self, mock_logging):
|
|
self.cluster.db_info.task_status = ClusterTasks.BUILDING_INITIAL
|
|
self.assertRaises(exception.UnprocessableEntity,
|
|
self.cluster.delete)
|
|
|
|
@patch.object(task_api.API, 'delete_cluster')
|
|
@patch.object(Cluster, 'update_db')
|
|
@patch.object(inst_models.DBInstance, 'find_all')
|
|
def test_delete_task_status_none(self,
|
|
mock_find_all,
|
|
mock_update_db,
|
|
mock_delete_cluster):
|
|
self.cluster.db_info.task_status = ClusterTasks.NONE
|
|
self.cluster.delete()
|
|
mock_update_db.assert_called_with(task_status=ClusterTasks.DELETING)
|
|
|
|
@patch.object(task_api.API, 'delete_cluster')
|
|
@patch.object(Cluster, 'update_db')
|
|
@patch.object(inst_models.DBInstance, 'find_all')
|
|
def test_delete_task_status_deleting(self,
|
|
mock_find_all,
|
|
mock_update_db,
|
|
mock_delete_cluster):
|
|
self.cluster.db_info.task_status = ClusterTasks.DELETING
|
|
self.cluster.delete()
|
|
mock_update_db.assert_called_with(task_status=ClusterTasks.DELETING)
|