openstack
/
trove
Code Issues Proposed changes

Merge "Fix MongoDB guest strategy implementation"

This commit is contained in:
Jenkins 2015-01-09 20:58:40 +00:00 committed by Gerrit Code Review
parent f86a0e6cc2 98a58d40f5
commit 9b68d5ba08
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
trove/common/strategies/mongodb/guestagent.py
View File

@ -39,6 +39,7 @@ class MongoDbGuestAgentAPI(guest_api.API):
'replica_set_member': replica_set_member,
'id': self.id})
return self._call("add_shard", guest_api.AGENT_HIGH_TIMEOUT,
self.version_cap,
replica_set_name=replica_set_name,
replica_set_member=replica_set_member)
@ -46,15 +47,16 @@ class MongoDbGuestAgentAPI(guest_api.API):
LOG.debug("Adding members %(members)s on instance %(id)s" % {
'members': members, 'id': self.id})
return self._call("add_members", guest_api.AGENT_HIGH_TIMEOUT,
members=members)
self.version_cap, members=members)
def add_config_servers(self, config_servers):
LOG.debug("Adding config servers %(config_servers)s for instance "
"%(id)s" % {'config_servers': config_servers,
'id': self.id})
return self._call("add_config_servers", guest_api.AGENT_HIGH_TIMEOUT,
config_servers=config_servers)
self.version_cap, config_servers=config_servers)
def cluster_complete(self):
LOG.debug("Notify regarding cluster install completion")
return self._call("cluster_complete", guest_api.AGENT_LOW_TIMEOUT)
return self._call("cluster_complete", guest_api.AGENT_LOW_TIMEOUT,
self.version_cap)

11
trove/common/strategies/mongodb/taskmanager.py
View File

@ -315,8 +315,9 @@ class MongoDbTaskManagerAPI(task_api.API):
def mongodb_add_shard_cluster(self, cluster_id, shard_id,
replica_set_name):
LOG.debug("Making async call to add shard cluster %s " % cluster_id)
self.cast(self.context,
self.make_msg("mongodb_add_shard_cluster",
cluster_id=cluster_id,
shard_id=shard_id,
replica_set_name=replica_set_name))
cctxt = self.client.prepare(version=self.version_cap)
cctxt.cast(self.context,
"mongodb_add_shard_cluster",
cluster_id=cluster_id,
shard_id=shard_id,
replica_set_name=replica_set_name)