Fix assertion with --innodb-sync-debug=ON

vaintroub · vaintroub · commit 1bbb67b3f24b · 2020-01-12T19:10:59.000+01:00
srv_purge_wakeup() is called under protection of latch in
purge_sys_t::resume()

move sync check code before acquiring that latch.
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
@@ -2290,8 +2290,6 @@ void
 srv_purge_wakeup()
 {
 	ut_ad(!srv_read_only_mode);
-	ut_ad(!sync_check_iterate(sync_check()));
-
 	if (srv_force_recovery >= SRV_FORCE_NO_BACKGROUND) {
 		return;
 	}
diff --git a/storage/innobase/trx/trx0purge.cc b/storage/innobase/trx/trx0purge.cc
@@ -1349,7 +1349,7 @@ void purge_sys_t::resume()
      ut_ad(!srv_undo_sources);
      return;
    }
-
+   ut_ad(!sync_check_iterate(sync_check()));
    rw_lock_x_lock(&latch);
    int32_t paused= m_paused--;
    ut_a(paused);

Original file line number	Diff line number	Diff line change
`@@ -2290,8 +2290,6 @@ void`
`2290`	`2290`	`srv_purge_wakeup()`
`2291`	`2291`	`{`
`2292`	`2292`	`ut_ad(!srv_read_only_mode);`
`2293`		`- ut_ad(!sync_check_iterate(sync_check()));`
`2294`		`-`
`2295`	`2293`	`if (srv_force_recovery >= SRV_FORCE_NO_BACKGROUND) {`
`2296`	`2294`	`return;`
`2297`	`2295`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1349,7 +1349,7 @@ void purge_sys_t::resume()`
`1349`	`1349`	`ut_ad(!srv_undo_sources);`
`1350`	`1350`	`return;`
`1351`	`1351`	`}`
`1352`		`-`
	`1352`	`+ ut_ad(!sync_check_iterate(sync_check()));`
`1353`	`1353`	`rw_lock_x_lock(&latch);`
`1354`	`1354`	`int32_t paused= m_paused--;`
`1355`	`1355`	`ut_a(paused);`