openstack
/
trove
Code Issues Proposed changes

Merge "Avoid load deleted instances that belong to a cluster."

This commit is contained in:
Zuul 2017-11-14 23:18:26 +00:00 committed by Gerrit Code Review
parent e94dcce00d b2b54ff05c
commit 6f3fb84f6c
8 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
trove/common/strategies/cluster/experimental/cassandra/taskmanager.py
View File

@ -116,7 +116,8 @@ class CassandraClusterTasks(task_models.ClusterTasks):
@classmethod
def find_cluster_node_ids(cls, cluster_id):
db_instances = DBInstance.find_all(cluster_id=cluster_id).all()
db_instances = DBInstance.find_all(cluster_id=cluster_id,
deleted=False).all()
return [db_instance.id for db_instance in db_instances]
@classmethod

1
trove/common/strategies/cluster/experimental/mongodb/api.py
View File

@ -248,6 +248,7 @@ class MongoDbCluster(models.Cluster):
raise exception.UnprocessableEntity(msg)
db_insts = inst_models.DBInstance.find_all(cluster_id=self.id,
deleted=False,
type='member').all()
num_unique_shards = len(set([db_inst.shard_id for db_inst
in db_insts]))

1
trove/common/strategies/cluster/experimental/mongodb/taskmanager.py
View File

@ -137,6 +137,7 @@ class MongoDbClusterTasks(task_models.ClusterTasks):
def _add_shard_cluster():
db_instances = DBInstance.find_all(cluster_id=cluster_id,
deleted=False,
shard_id=shard_id).all()
instance_ids = [db_instance.id for db_instance in db_instances]
LOG.debug("instances in shard %(shard_id)s: %(instance_ids)s",

3
trove/common/strategies/cluster/experimental/redis/taskmanager.py
View File

@ -106,7 +106,8 @@ class RedisClusterTasks(task_models.ClusterTasks):
def _grow_cluster():
db_instances = DBInstance.find_all(cluster_id=cluster_id).all()
db_instances = DBInstance.find_all(cluster_id=cluster_id,
deleted=False).all()
cluster_head = next(Instance.load(context, db_inst.id)
for db_inst in db_instances
if db_inst.id not in new_instance_ids)

3
trove/common/strategies/cluster/experimental/vertica/api.py
View File

@ -74,7 +74,8 @@ class VerticaCluster(models.Cluster):
vertica_conf = CONF.get(datastore_version.manager)
num_instances = len(instances)
existing = inst_models.DBInstance.find_all(cluster_id=db_info.id).all()
existing = inst_models.DBInstance.find_all(cluster_id=db_info.id,
deleted=False).all()
num_existing = len(existing)
# Matching number of instances with configured cluster_member_count

4
trove/extensions/common/service.py
View File

@ -190,7 +190,9 @@ class ClusterRootController(DefaultRootController):
cluster_instances)
def _find_cluster_node_ids(self, tenant_id, cluster_id):
args = {'tenant_id': tenant_id, 'cluster_id': cluster_id}
args = {'tenant_id': tenant_id,
'cluster_id': cluster_id,
'deleted': False}
cluster_instances = DBInstance.find_all(**args).all()
return [db_instance.id for db_instance in cluster_instances]

2
trove/extensions/mongodb/service.py
View File

@ -33,7 +33,7 @@ class MongoDBRootController(ClusterRootController):
def _find_query_router_ids(self, tenant_id, cluster_id):
args = {'tenant_id': tenant_id, 'cluster_id': cluster_id,
'type': 'query_router'}
'deleted': False, 'type': 'query_router'}
query_router_instances = DBInstance.find_all(**args).all()
return [db_instance.id for db_instance in query_router_instances]

6
trove/taskmanager/models.py
View File

@ -337,7 +337,8 @@ class ClusterTasks(Cluster):
cluster_notification = context.notification
request_info = cluster_notification.serialize(context)
try:
node_db_inst = DBInstance.find_all(cluster_id=cluster_id).all()
node_db_inst = DBInstance.find_all(cluster_id=cluster_id,
deleted=False).all()
for index, db_inst in enumerate(node_db_inst):
if index > 0:
LOG.debug(
@ -381,7 +382,8 @@ class ClusterTasks(Cluster):
cluster_notification = context.notification
request_info = cluster_notification.serialize(context)
try:
for db_inst in DBInstance.find_all(cluster_id=cluster_id).all():
for db_inst in DBInstance.find_all(cluster_id=cluster_id,
deleted=False).all():
instance = BuiltInstanceTasks.load(
context, db_inst.id)
_upgrade_cluster_instance(instance)