openstack
/
trove
Code Issues Proposed changes

Merge "Add validation for galera_common grow."

This commit is contained in:
Zuul 2018-01-19 05:09:47 +00:00 committed by Gerrit Code Review
parent fe49104288 5bc2231325
commit 3c363d24fd
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
trove/common/strategies/cluster/experimental/galera_common/api.py
View File

@ -58,11 +58,6 @@ class GaleraCommonCluster(cluster_models.Cluster):
ds_conf = CONF.get(datastore_version.manager)
num_instances = len(instances)
# Check number of instances is at least min_cluster_member_count
if num_instances < ds_conf.min_cluster_member_count:
raise exception.ClusterNumInstancesNotLargeEnough(
num_instances=ds_conf.min_cluster_member_count)
# Checking volumes and get delta for quota check
cluster_models.validate_instance_flavors(
context, instances, ds_conf.volume_support, ds_conf.device_path)
@ -118,6 +113,11 @@ class GaleraCommonCluster(cluster_models.Cluster):
def create(cls, context, name, datastore, datastore_version,
instances, extended_properties, locality, configuration):
LOG.debug("Initiating Galera cluster creation.")
ds_conf = CONF.get(datastore_version.manager)
# Check number of instances is at least min_cluster_member_count
if len(instances) < ds_conf.min_cluster_member_count:
raise exception.ClusterNumInstancesNotLargeEnough(
num_instances=ds_conf.min_cluster_member_count)
cls._validate_cluster_instances(context, instances, datastore,
datastore_version)
# Updating Cluster Task
@ -147,6 +147,9 @@ class GaleraCommonCluster(cluster_models.Cluster):
datastore = self.ds
datastore_version = self.ds_version
self._validate_cluster_instances(context, instances, datastore,
datastore_version)
db_info.update(task_status=ClusterTasks.GROWING_CLUSTER)
try:
locality = srv_grp.ServerGroup.convert_to_hint(self.server_group)