Skip to content

Commit 5641564

Browse files
committed
Fixed replication tests
1 parent 8b7c8af commit 5641564

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

util/utility.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from util import pxc_startup
1212
from util import ps_startup
1313

14+
backup_dir=""
1415

1516
class Utility:
1617
def __init__(self, debug):
@@ -166,6 +167,12 @@ def pxb_backup(self, workdir, source_datadir, socket, encryption, dest_datadir=N
166167
print(copy_backup)
167168
os.system(copy_backup)
168169

170+
# Set backup dir
171+
global backup_dir
172+
backup_dir=workdir + "/backup"
173+
if self.debug == 'YES':
174+
print("Backup dir path: ", backup_dir)
175+
169176
# Copy keyring file to destination directory for encryption startup
170177
if encryption == 'YES':
171178
os.system("cp " + source_datadir + "/keyring " + dest_datadir)
@@ -267,10 +274,14 @@ def invoke_replication(self, basedir, master_socket, slave_socket, repl_mode, co
267274
if self.debug == 'YES':
268275
print(data_dir)
269276
data_dir = os.popen(data_dir).read().rstrip()
270-
query = "cat " + data_dir + "xtrabackup_binlog_pos_innodb | awk '{print $1}'"
277+
query = "cat " + backup_dir + "/xtrabackup_binlog_info | awk '{print $1}'"
271278
master_log_file = os.popen(query).read().rstrip()
272-
query = "cat " + data_dir + "xtrabackup_binlog_pos_innodb | awk '{print $2}'"
279+
query = "cat " + backup_dir + "/xtrabackup_binlog_info | awk '{print $2}'"
273280
master_log_pos = os.popen(query).read().rstrip()
281+
if self.debug == 'YES':
282+
print("Binlog data from xtrabackup_binlog_info")
283+
print("master_log_file: ", master_log_file)
284+
print("master_log_pos: ", master_log_pos)
274285
else:
275286
master_log_file = basedir + "/bin/mysql --user=root --socket=" + \
276287
master_socket + \

0 commit comments

Comments
 (0)