diff options
| author | Zuul <zuul@review.opendev.org> | 2020-11-28 11:26:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-11-28 11:26:47 +0000 |
| commit | 0c31076fe5631a30fbcb7d87fe83f0c14fbf237f (patch) | |
| tree | 3be245aaf4dff4c326ce37b47b8287f88cabc411 | |
| parent | 0fe2f69dffaaaeabd2176bc193a7a11ee5d8e618 (diff) | |
| parent | 8987244c407b7dcb13dec1f20d3cc8a2c82c4dcd (diff) | |
| download | trove-0c31076fe5631a30fbcb7d87fe83f0c14fbf237f.tar.gz | |
Merge "Use current slave_pos of slave to continue replicate"
| -rw-r--r-- | trove/guestagent/strategies/replication/mariadb_gtid.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/trove/guestagent/strategies/replication/mariadb_gtid.py b/trove/guestagent/strategies/replication/mariadb_gtid.py index b95853bb..4909ee66 100644 --- a/trove/guestagent/strategies/replication/mariadb_gtid.py +++ b/trove/guestagent/strategies/replication/mariadb_gtid.py @@ -42,15 +42,11 @@ class MariaDBGTIDReplication(mysql_base.MysqlReplicationBase): logging_config = master_info['log_position'] last_gtid = '' - if 'gtid_pos' in logging_config: - # This will happen during master failover. - last_gtid = logging_config['gtid_pos'] - elif 'dataset' in master_info: + if 'dataset' in master_info: # This will happen when initial replication is set up. last_gtid = self.read_last_master_gtid(service) - - set_gtid_cmd = "SET GLOBAL gtid_slave_pos='%s';" % last_gtid - service.execute_sql(set_gtid_cmd) + set_gtid_cmd = "SET GLOBAL gtid_slave_pos='%s';" % last_gtid + service.execute_sql(set_gtid_cmd) change_master_cmd = ( "CHANGE MASTER TO " |