openstack/trove
Code Issues Proposed changes

Merge "convert to type str to compare"

Browse Source
This commit is contained in:
Zuul 2020-11-19 21:59:04 +00:00 committed by Gerrit Code Review
commit 97e0a940df
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trove/guestagent/datastore/mariadb/service.py
View File

@ -63,7 +63,7 @@ class MariaDBApp(mysql_service.BaseMySqlApp):
gtid_executed = self._get_gtid_executed() gtid_executed = self._get_gtid_executed()
for gtid_set in gtid_executed.split(','): for gtid_set in gtid_executed.split(','):
uuid_set = gtid_set.split('-') uuid_set = gtid_set.split('-')
if uuid_set[1] == master_UUID: if str(uuid_set[1]) == str(master_UUID):
last_txn_id = uuid_set[-1] last_txn_id = uuid_set[-1]
break break
return master_UUID, int(last_txn_id) return master_UUID, int(last_txn_id)

2
trove/guestagent/datastore/mysql/service.py
View File

@ -50,7 +50,7 @@ class MySqlApp(service.BaseMySqlApp):
gtid_executed = self._get_gtid_executed() gtid_executed = self._get_gtid_executed()
for gtid_set in gtid_executed.split(','): for gtid_set in gtid_executed.split(','):
uuid_set = gtid_set.split(':') uuid_set = gtid_set.split(':')
if uuid_set[0] == master_UUID: if str(uuid_set[0]) == str(master_UUID):
last_txn_id = uuid_set[-1].split('-')[-1] last_txn_id = uuid_set[-1].split('-')[-1]
break break
return master_UUID, int(last_txn_id) return master_UUID, int(last_txn_id)