Skip to content

Commit a7ad1cb

Browse files
zmurzmur
committed
Bug#36132676 Some ndb tests fail for mtr --defaults-extra-file=suite/ndb/encrypted_backup.cnf
Change-Id: I328b29096c4d1703da546f42f1ce803b03c0aed2
1 parent d858a22 commit a7ad1cb

24 files changed

+109
-92
lines changed

‎mysql-test/suite/ndb/encrypted_backup.cnf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@ backup-password=TOPSECRET
88

99
[ndb_print_backup_file]
1010
backup-password=TOPSECRET
11+
12+
[ENV]
13+
NDB_MGM_NO_ENCR=--skip-encrypt-backup --skip-backup-password
14+
NDB_PRINT_BACKUP_FILE_NO_ENCR=-skip-backup-password
15+
NDB_RESTORE_NO_ENCR=--skip-decrypt --skip-backup-password

‎mysql-test/suite/ndb/t/ndb_76_inplace_upgrade.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363

6464
--connection server1
6565
--echo # Restore 7.6 backup into NDB
66-
--exec $NDB_RESTORE -b 1 -n 1 -m -r --disable-indexes --include-databases=mysql,test,db1 $NDB_SAVED_BACKUPS/76_inplace_upgrade_backup >> $NDB_TOOLS_OUTPUT
67-
--exec $NDB_RESTORE -b 1 -n 2 -r --include-databases=mysql,test,db1 $NDB_SAVED_BACKUPS/76_inplace_upgrade_backup >> $NDB_TOOLS_OUTPUT
68-
--exec $NDB_RESTORE -b 1 -n 1 --rebuild-indexes --include-databases=mysql,test,db1 $NDB_SAVED_BACKUPS/76_inplace_upgrade_backup >> $NDB_TOOLS_OUTPUT
66+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 -m -r --disable-indexes --include-databases=mysql,test,db1 $NDB_SAVED_BACKUPS/76_inplace_upgrade_backup >> $NDB_TOOLS_OUTPUT
67+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 2 -r --include-databases=mysql,test,db1 $NDB_SAVED_BACKUPS/76_inplace_upgrade_backup >> $NDB_TOOLS_OUTPUT
68+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 --rebuild-indexes --include-databases=mysql,test,db1 $NDB_SAVED_BACKUPS/76_inplace_upgrade_backup >> $NDB_TOOLS_OUTPUT
6969

7070
--echo # Setup the 7.6 data directory
7171
--echo # Copy zip files to tmp

‎mysql-test/suite/ndb/t/ndb_76_inplace_upgrade_triggers.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353

5454
--connection server1
5555
--echo # Restore 7.6 backup into NDB
56-
--exec $NDB_RESTORE -b 1 -n 1 -m -r --disable-indexes --include-databases=mysql,test $NDB_SAVED_BACKUPS/76_inplace_upgrade_triggers_backup >> $NDB_TOOLS_OUTPUT
57-
--exec $NDB_RESTORE -b 1 -n 2 -r --include-databases=mysql,test $NDB_SAVED_BACKUPS/76_inplace_upgrade_triggers_backup >> $NDB_TOOLS_OUTPUT
58-
--exec $NDB_RESTORE -b 1 -n 1 --rebuild-indexes --include-databases=mysql,test $NDB_SAVED_BACKUPS/76_inplace_upgrade_triggers_backup >> $NDB_TOOLS_OUTPUT
56+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 -m -r --disable-indexes --include-databases=mysql,test $NDB_SAVED_BACKUPS/76_inplace_upgrade_triggers_backup >> $NDB_TOOLS_OUTPUT
57+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 2 -r --include-databases=mysql,test $NDB_SAVED_BACKUPS/76_inplace_upgrade_triggers_backup >> $NDB_TOOLS_OUTPUT
58+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 --rebuild-indexes --include-databases=mysql,test $NDB_SAVED_BACKUPS/76_inplace_upgrade_triggers_backup >> $NDB_TOOLS_OUTPUT
5959

6060
--echo # Setup the 7.6 data directory
6161
--echo # Copy zip files to tmp

‎mysql-test/suite/ndb/t/ndb_alter_table_backup.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
--echo *********************************
1717
--echo * restore tables w/ new column from little endian
1818
--echo *********************************
19-
--exec $NDB_RESTORE -b 1 -n 1 -m -r $NDB_SAVED_BACKUPS/51_d2_le >> $NDB_TOOLS_OUTPUT 2>&1
20-
--exec $NDB_RESTORE -b 1 -n 2 -r $NDB_SAVED_BACKUPS/51_d2_le >> $NDB_TOOLS_OUTPUT 2>&1
19+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 -m -r $NDB_SAVED_BACKUPS/51_d2_le >> $NDB_TOOLS_OUTPUT 2>&1
20+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 2 -r $NDB_SAVED_BACKUPS/51_d2_le >> $NDB_TOOLS_OUTPUT 2>&1
2121

2222
--disable_query_log
2323
call mtr.add_suppression("Table upgrade required");
@@ -43,8 +43,8 @@ SHOW WARNINGS;
4343
--echo *********************************
4444
--echo * restore tables w/ new column from big endian
4545
--echo *********************************
46-
--exec $NDB_RESTORE -b 1 -n 1 -m -r $NDB_SAVED_BACKUPS/51_d2_be >> $NDB_TOOLS_OUTPUT 2>&1
47-
--exec $NDB_RESTORE -b 1 -n 2 -r $NDB_SAVED_BACKUPS/51_d2_be >> $NDB_TOOLS_OUTPUT 2>&1
46+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 -m -r $NDB_SAVED_BACKUPS/51_d2_be >> $NDB_TOOLS_OUTPUT 2>&1
47+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 2 -r $NDB_SAVED_BACKUPS/51_d2_be >> $NDB_TOOLS_OUTPUT 2>&1
4848

4949
--error ER_NO_SUCH_TABLE
5050
SHOW CREATE TABLE t1;

‎mysql-test/suite/ndb/t/ndb_column_properties_compat.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
-- source suite/ndb/include/backup_restore_setup.inc
77

88
CREATE DATABASE BANK default charset=latin1 default collate=latin1_bin;
9-
--exec $NDB_RESTORE -b 1 -n 1 -p 1 -m -r $NDB_SAVED_BACKUPS/51 >> $NDB_TOOLS_OUTPUT
10-
--exec $NDB_RESTORE -e -b 1 -n 2 -p 1 -r $NDB_SAVED_BACKUPS/51 >> $NDB_TOOLS_OUTPUT
9+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 -p 1 -m -r $NDB_SAVED_BACKUPS/51 >> $NDB_TOOLS_OUTPUT
10+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -e -b 1 -n 2 -p 1 -r $NDB_SAVED_BACKUPS/51 >> $NDB_TOOLS_OUTPUT
1111
USE BANK;
1212

1313
# Check for warnings of implicit conversion of COLUMN_FORMAT

‎mysql-test/suite/ndb/t/ndb_dd_restore_compat.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
--let $initial_detected_count = query_get_value(SHOW STATUS LIKE 'Ndb_metadata_detected_count', Value, 1)
66
--let $initial_synced_count = query_get_value(SHOW STATUS LIKE 'Ndb_metadata_synced_count', Value, 1)
77

8-
--exec $NDB_RESTORE -b 1 -n 1 -p 1 -m -r $NDB_SAVED_BACKUPS/51_dd >> $NDB_TOOLS_OUTPUT
9-
--exec $NDB_RESTORE -e -b 1 -n 2 -p 1 -r $NDB_SAVED_BACKUPS/51_dd >> $NDB_TOOLS_OUTPUT
8+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 -p 1 -m -r $NDB_SAVED_BACKUPS/51_dd >> $NDB_TOOLS_OUTPUT
9+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -e -b 1 -n 2 -p 1 -r $NDB_SAVED_BACKUPS/51_dd >> $NDB_TOOLS_OUTPUT
1010

1111
--disable_query_log
1212
# Turn auto sync on with a low interval so changes are detected quickly

‎mysql-test/suite/ndb/t/ndb_encrypted_backup.test

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,17 +128,29 @@ write_file $MYSQL_TMP_DIR/backup_password.txt;
128128
SECRET
129129
EOF
130130

131+
# If one for example do:
132+
#
133+
# ./mtr --defaults-extra-file=suite/ndb/encrypted_backup.cnf ...
134+
#
135+
# then ndb_mgm below will emit a password on command line warning due to the
136+
# use of --skip-backup-password (via $NDB_MGM_NO_ENCR) to undo the setting of
137+
# backup-password in encrypted_backup.cnf.
138+
#
139+
# Therefore we remove the warning in below two cases.
140+
131141
--echo
132142
--echo # Test START BACKUP ENCRYPT with password from stdin
133-
replace_regex /[0-9]+/X/ ;
134-
exec $NDB_MGM 2>&1 < $MYSQL_TMP_DIR/backup_password.txt
143+
replace_regex /[0-9]+/X/
144+
/ndb_mgm: .Warning. Using a password on the command line interface can be insecure.*\n//;
145+
exec $NDB_MGM $NDB_MGM_NO_ENCR 2>&1 < $MYSQL_TMP_DIR/backup_password.txt
135146
--backup-password-from-stdin
136147
--execute="START BACKUP ENCRYPT";
137148

138149
--echo
139150
--echo # Make START BACKUP trigger encrypted backup.
140-
replace_regex /[0-9]+/X/ ;
141-
exec $NDB_MGM 2>&1 < $MYSQL_TMP_DIR/backup_password.txt
151+
replace_regex /[0-9]+/X/
152+
/ndb_mgm: .Warning. Using a password on the command line interface can be insecure.*\n//;
153+
exec $NDB_MGM $NDB_MGM_NO_ENCR 2>&1 < $MYSQL_TMP_DIR/backup_password.txt
142154
--encrypt-backup
143155
--backup-password-from-stdin
144156
--execute="START BACKUP";

‎mysql-test/suite/ndb/t/ndb_metadata_upgrade_80_minor.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
# INSERT INTO t5 VALUES (1,'Lipstick on a pig');
6363
#
6464

65-
--exec $NDB_RESTORE -b 1 -n 1 -m -r --backup-path=$NDB_SAVED_BACKUPS/metadata_upgrade_80_minor >> $NDB_TOOLS_OUTPUT
66-
--exec $NDB_RESTORE -b 1 -n 2 -r --backup-path=$NDB_SAVED_BACKUPS/metadata_upgrade_80_minor >> $NDB_TOOLS_OUTPUT
65+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 -m -r --backup-path=$NDB_SAVED_BACKUPS/metadata_upgrade_80_minor >> $NDB_TOOLS_OUTPUT
66+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 2 -r --backup-path=$NDB_SAVED_BACKUPS/metadata_upgrade_80_minor >> $NDB_TOOLS_OUTPUT
6767

6868
--echo Backup restored
6969

‎mysql-test/suite/ndb/t/ndb_metadata_upgrade_80_minor_fk.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
# INSERT INTO self_ref VALUES(1,1), (2,1);
4444
#
4545

46-
--exec $NDB_RESTORE -b 1 -n 1 -m -r --backup-path=$NDB_SAVED_BACKUPS/metadata_upgrade_80_minor_fk >> $NDB_TOOLS_OUTPUT
47-
--exec $NDB_RESTORE -b 1 -n 2 -r --backup-path=$NDB_SAVED_BACKUPS/metadata_upgrade_80_minor_fk >> $NDB_TOOLS_OUTPUT
46+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 -m -r --backup-path=$NDB_SAVED_BACKUPS/metadata_upgrade_80_minor_fk >> $NDB_TOOLS_OUTPUT
47+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 2 -r --backup-path=$NDB_SAVED_BACKUPS/metadata_upgrade_80_minor_fk >> $NDB_TOOLS_OUTPUT
4848

4949
--echo Backup restored
5050

‎mysql-test/suite/ndb/t/ndb_metadata_upgrade_advanced.test

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242

4343
# Case 1: Metadata upgrade during schema synchronization
4444

45-
--exec $NDB_RESTORE -b 1 -n 1 -m -r --disable-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
46-
--exec $NDB_RESTORE -b 1 -n 2 -r $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
47-
--exec $NDB_RESTORE -b 1 -n 1 --rebuild-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
45+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 -m -r --disable-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
46+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 2 -r $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
47+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 --rebuild-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
4848

4949
--echo Backup from 7.5 restored
5050

@@ -94,9 +94,9 @@ DROP TABLE t3;
9494

9595
# Case 2: Metadata upgrade during discovery from NDB
9696

97-
--exec $NDB_RESTORE -b 1 -n 1 -m -r --disable-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
98-
--exec $NDB_RESTORE -b 1 -n 2 -r $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
99-
--exec $NDB_RESTORE -b 1 -n 1 --rebuild-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
97+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 -m -r --disable-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
98+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 2 -r $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
99+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 --rebuild-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
100100

101101
SHOW CREATE TABLE t1;
102102
--sorted_result
@@ -146,8 +146,8 @@ DROP TABLE t3;
146146
--let $initial_synced_count = query_get_value(SHOW STATUS LIKE 'Ndb_metadata_synced_count', Value, 1)
147147

148148
--echo Restore metadata and data but do not create indexes
149-
--exec $NDB_RESTORE -b 1 -n 1 -m -r --disable-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
150-
--exec $NDB_RESTORE -b 1 -n 2 -r $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
149+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 -m -r --disable-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
150+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 2 -r $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
151151

152152
--disable_query_log
153153
# Suppress expected warnings due to missing indexes
@@ -205,7 +205,7 @@ SET GLOBAL ndb_metadata_check_interval = @old_ndb_metadata_check_interval;
205205
SHOW TABLES;
206206

207207
--echo Rebuild indexes in NDB
208-
--exec $NDB_RESTORE -b 1 -n 1 --rebuild-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
208+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 --rebuild-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_advanced_backup >> $NDB_TOOLS_OUTPUT
209209

210210
# Indexes have been rebuilt which means that the tables are now
211211
# ready to be synced
@@ -274,9 +274,9 @@ DROP TABLE t1,t2,t3;
274274

275275
--connection server1
276276

277-
--exec $NDB_RESTORE -b 1 -n 1 -m -r --disable-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_disk_data_backup >> $NDB_TOOLS_OUTPUT
278-
--exec $NDB_RESTORE -b 1 -n 2 -r $NDB_SAVED_BACKUPS/metadata_upgrade_disk_data_backup >> $NDB_TOOLS_OUTPUT
279-
--exec $NDB_RESTORE -b 1 -n 1 --rebuild-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_disk_data_backup >> $NDB_TOOLS_OUTPUT
277+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 -m -r --disable-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_disk_data_backup >> $NDB_TOOLS_OUTPUT
278+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 2 -r $NDB_SAVED_BACKUPS/metadata_upgrade_disk_data_backup >> $NDB_TOOLS_OUTPUT
279+
--exec $NDB_RESTORE $NDB_RESTORE_NO_ENCR -b 1 -n 1 --rebuild-indexes $NDB_SAVED_BACKUPS/metadata_upgrade_disk_data_backup >> $NDB_TOOLS_OUTPUT
280280
--echo Backup from 7.6 restored
281281

282282
--echo Restart server 1 to trigger schema synchronization

0 commit comments

Comments
 (0)