diff options
Diffstat (limited to 'trove/guestagent/strategies/replication')
-rw-r--r-- | trove/guestagent/strategies/replication/experimental/mariadb_gtid.py | 26 | ||||
-rw-r--r-- | trove/guestagent/strategies/replication/mysql_base.py | 1 |
2 files changed, 16 insertions, 11 deletions
diff --git a/trove/guestagent/strategies/replication/experimental/mariadb_gtid.py b/trove/guestagent/strategies/replication/experimental/mariadb_gtid.py index c3b82a44..30e73948 100644 --- a/trove/guestagent/strategies/replication/experimental/mariadb_gtid.py +++ b/trove/guestagent/strategies/replication/experimental/mariadb_gtid.py @@ -17,16 +17,10 @@ from oslo_log import log as logging from trove.common import cfg -from trove.guestagent.backup.backupagent import BackupAgent from trove.guestagent.strategies import backup from trove.guestagent.strategies.replication import mysql_base -AGENT = BackupAgent() CONF = cfg.CONF - -REPL_BACKUP_NAMESPACE = 'trove.guestagent.strategies.backup' \ - '.experimental.mariadb_impl' - LOG = logging.getLogger(__name__) @@ -35,17 +29,27 @@ class MariaDBGTIDReplication(mysql_base.MysqlReplicationBase): @property def repl_backup_runner(self): - return backup.get_backup_strategy('MariaDBInnoBackupEx', - REPL_BACKUP_NAMESPACE) + return backup.get_backup_strategy( + CONF.mariadb.backup_strategy, + CONF.mariadb.backup_namespace + ) @property def repl_incr_backup_runner(self): - return backup.get_backup_strategy('MariaDBInnoBackupExIncremental', - REPL_BACKUP_NAMESPACE) + strategy = CONF.mariadb.backup_incremental_strategy.get( + CONF.mariadb.backup_strategy, CONF.mariadb.backup_strategy + ) + + return backup.get_backup_strategy( + strategy, + CONF.mariadb.backup_namespace + ) @property def repl_backup_extra_opts(self): - return CONF.backup_runner_options.get('MariaDBInnoBackupEx', '') + return CONF.backup_runner_options.get( + CONF.mariadb.backup_strategy, '' + ) def connect_to_master(self, service, snapshot): logging_config = snapshot['log_position'] diff --git a/trove/guestagent/strategies/replication/mysql_base.py b/trove/guestagent/strategies/replication/mysql_base.py index 549198a5..6a3843af 100644 --- a/trove/guestagent/strategies/replication/mysql_base.py +++ b/trove/guestagent/strategies/replication/mysql_base.py @@ -107,6 +107,7 @@ class MysqlReplicationBase(base.Replication): incremental_runner=self.repl_incr_backup_runner) else: LOG.debug("Using existing backup created for previous replica.") + LOG.debug("Replication snapshot %(snapshot_id)s used for replica " "number %(replica_number)d.", {'snapshot_id': snapshot_id, |