openstack/trove
Code Issues Proposed changes

Merge "Fix promote for Redis datastore"

Browse Source
This commit is contained in:
Jenkins
2015-10-02 09:18:50 +00:00
committed by Gerrit Code Review
parent 19aef70571 6c4db5d327
commit 1cb7dc7792
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
trove/guestagent/datastore/experimental/redis/manager.py
View File

@@ -122,9 +122,10 @@ class Manager(periodic_task.PeriodicTasks):
persistence_dir = self._app.get_working_dir() persistence_dir = self._app.get_working_dir()
self._perform_restore(backup_info, context, persistence_dir, self._perform_restore(backup_info, context, persistence_dir,
self._app) self._app)
else:
self._app.restart()
if snapshot: if snapshot:
self.attach_replica(context, snapshot, snapshot['config']) self.attach_replica(context, snapshot, snapshot['config'])
self._app.restart()
if cluster_config: if cluster_config:
self._app.status.set_status( self._app.status.set_status(
rd_instance.ServiceStatuses.BUILD_PENDING) rd_instance.ServiceStatuses.BUILD_PENDING)

4
trove/guestagent/strategies/replication/experimental/redis_sync.py
View File

@@ -66,6 +66,8 @@ class RedisSyncReplication(base.Replication):
if master_passwd: if master_passwd:
connect_options['masterauth'] = master_passwd connect_options['masterauth'] = master_passwd
service.admin.config_set('masterauth', master_passwd) service.admin.config_set('masterauth', master_passwd)
else:
service.admin.config_set('masterauth', "")
service.configuration_manager.apply_system_override( service.configuration_manager.apply_system_override(
connect_options, change_id=self.CONF_LABEL_REPLICATION_SLAVE) connect_options, change_id=self.CONF_LABEL_REPLICATION_SLAVE)
service.admin.set_master(host=master_host, port=master_port) service.admin.set_master(host=master_host, port=master_port)
@@ -75,7 +77,7 @@ class RedisSyncReplication(base.Replication):
service.configuration_manager.remove_system_override( service.configuration_manager.remove_system_override(
change_id=self.CONF_LABEL_REPLICATION_SLAVE) change_id=self.CONF_LABEL_REPLICATION_SLAVE)
service.admin.set_master(host=None, port=None) service.admin.set_master(host=None, port=None)
service.admin.config_set('masterauth', None) service.admin.config_set('masterauth', "")
return None return None
def cleanup_source_on_replica_detach(self, service, replica_info): def cleanup_source_on_replica_detach(self, service, replica_info):