Bug#31341888 RECURRING TEMPORARY ERRORS STALL NDB METADATA SYNC

Post push fix: Stabilize a test by making the detection + sync
deterministic

Change-Id: I87d1393c04e5508d2c516d102458db754d45a2f9

Author: arnabray21

mysql-test/suite/ndb_ddl/metadata_sync_restore_disable_index.result

@@ -6,11 +6,6 @@ UNIQUE ib(b),
 INDEX ic(c)
 ) ENGINE NDB;
 INSERT INTO t1 VALUES (1,2,3),(2,3,5),(3,4,6),(4,5,8),(5,6,2),(6,7,2);
-CREATE TABLE t2 (
-a INT,
-b VARCHAR(10)
-) ENGINE NDB;
-INSERT INTO t2 VALUES (1,'Number 4'),(2,'Privet'),(3,'Drive');
 CREATE TABLE parent (
 c1 INT PRIMARY KEY
 ) ENGINE NDB;
@@ -24,27 +19,18 @@ REFERENCES parent(c1)
 ON DELETE CASCADE
 ) ENGINE NDB;
 INSERT INTO child VALUES (1,1),(2,2);
-DROP TABLE t1,t2,child,parent;
+DROP TABLE t1,child,parent;
+Restore with --disable-indexes
+include/assert.inc [Synced count has remained unchanged]
 SHOW TABLES;
 Tables_in_test
-t2
-SHOW CREATE TABLE t2;
-Table	Create Table
-t2	CREATE TABLE `t2` (
-  `a` int DEFAULT NULL,
-  `b` varchar(10) DEFAULT NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
-SELECT * FROM t2;
-a	b
-1	Number 4
-2	Privet
-3	Drive
+Rebuild indexes in NDB
+Wait until the objects are synced
 SHOW TABLES;
 Tables_in_test
 child
 parent
 t1
-t2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -86,4 +72,4 @@ SELECT * FROM child;
 c1	c2
 1	1
 2	2
-DROP TABLE t1,t2,child,parent;
+DROP TABLE t1,child,parent;

mysql-test/suite/ndb_ddl/metadata_sync_restore_disable_index.test

@@ -20,13 +20,6 @@ CREATE TABLE t1 (
 
 INSERT INTO t1 VALUES (1,2,3),(2,3,5),(3,4,6),(4,5,8),(5,6,2),(6,7,2);
 
-CREATE TABLE t2 (
-  a INT,
-  b VARCHAR(10)
-) ENGINE NDB;
-
-INSERT INTO t2 VALUES (1,'Number 4'),(2,'Privet'),(3,'Drive');
-
 CREATE TABLE parent (
   c1 INT PRIMARY KEY
 ) ENGINE NDB;
@@ -47,13 +40,13 @@ INSERT INTO child VALUES (1,1),(2,2);
 # Take a backup
 --source include/ndb_backup.inc
 
-DROP TABLE t1,t2,child,parent;
+DROP TABLE t1,child,parent;
 
 # Store initial counts of both detected and synchronized objects
 --let $initial_detected_count = query_get_value(SHOW STATUS LIKE 'Ndb_metadata_detected_count', Value, 1)
 --let $initial_synced_count = query_get_value(SHOW STATUS LIKE 'Ndb_metadata_synced_count', Value, 1)
 
-# Restore metadata and data but do not rebuild indexes
+--echo Restore with --disable-indexes
 --exec $NDB_RESTORE -b $the_backup_id -n 1 -m -r --disable-indexes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
 --exec $NDB_RESTORE -b $the_backup_id -n 2 -r $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
 
@@ -62,15 +55,14 @@ DROP TABLE t1,t2,child,parent;
 SET @old_ndb_metadata_check = @@global.ndb_metadata_check;
 SET @old_ndb_metadata_check_interval = @@global.ndb_metadata_check_interval;
 SET GLOBAL ndb_metadata_check = true;
-SET GLOBAL ndb_metadata_check_interval = 0;
+SET GLOBAL ndb_metadata_check_interval = 5;
 --enable_query_log
 
-# Wait until the following 4 object changes are detected:
+# Wait until the following 3 object changes are detected:
 # Table 'test.t1'
-# Table 'test.t2'
 # Table 'test.child'
 # Table 'test.parent'
---let $expected_changes = 4
+--let $expected_changes = 3
 --let $max_wait = 30
 --source wait_metadata_changes_detected.inc
 
@@ -80,29 +72,25 @@ SET GLOBAL ndb_metadata_check = @old_ndb_metadata_check;
 SET GLOBAL ndb_metadata_check_interval = @old_ndb_metadata_check_interval;
 --enable_query_log
 
-# Wait until table t2 is synced since it contains no indexes.
-# The remaining tables aren't synced but treated as temporary errors
-# instead
---let $expected_changes = 1
---let $max_wait = 30
---source wait_metadata_synced.inc
-
+# Check that no tables have been synced. The tables aren't
+# synced due to the missing indexes and are treated as
+# temporary failures
+--let $synced_count = query_get_value(SHOW STATUS LIKE 'Ndb_metadata_synced_count', Value, 1)
+--let $assert_cond = "$synced_count" = "$initial_synced_count"
+--let $assert_text = Synced count has remained unchanged
+--source include/assert.inc
 SHOW TABLES;
-SHOW CREATE TABLE t2;
---sorted_result
-SELECT * FROM t2;
 
-# Refresh counts
+# Refresh count
 --let $initial_detected_count = query_get_value(SHOW STATUS LIKE 'Ndb_metadata_detected_count', Value, 1)
---let $initial_synced_count = query_get_value(SHOW STATUS LIKE 'Ndb_metadata_synced_count', Value, 1)
 
-# Rebuild indexes in NDB
+--echo Rebuild indexes in NDB
 --exec $NDB_RESTORE -b $the_backup_id -n 1 --rebuild-indexes $NDB_BACKUPS-$the_backup_id >> $NDB_TOOLS_OUTPUT
 
 --disable_query_log
 # Set low interval so changes are detected quickly
 SET GLOBAL ndb_metadata_check = true;
-SET GLOBAL ndb_metadata_check_interval = 0;
+SET GLOBAL ndb_metadata_check_interval = 5;
 --enable_query_log
 
 # Wait until the following 3 object changes are detected:
@@ -119,7 +107,7 @@ SET GLOBAL ndb_metadata_check = @old_ndb_metadata_check;
 SET GLOBAL ndb_metadata_check_interval = @old_ndb_metadata_check_interval;
 --enable_query_log
 
-# Wait until the objects are synced
+--echo Wait until the objects are synced
 --let $max_wait = 30
 --source wait_metadata_synced.inc
 
@@ -135,7 +123,7 @@ SHOW CREATE TABLE child;
 --sorted_result
 SELECT * FROM child;
 
-DROP TABLE t1,t2,child,parent;
+DROP TABLE t1,child,parent;
 
 --source suite/ndb/include/backup_restore_cleanup.inc
 --remove_file $NDB_TOOLS_OUTPUT