1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#13417564 SKIP SLEEP IN SRV_MASTER_THREAD WHEN

Browse Source 
SHUTDOWN IS IN PROGRESS 

PROBLEM
-------
 In the background thread srv_master_thread() we have a 
 a one second delay loop which will continuously monitor
 server activity .If the server is inactive (with out any
 user activity) or in a shutdown state we do some background
 activity like flushing the changes.In the current code
 we are not checking if server is in shutdown state before
 sleeping for one second.

FIX
---
If server is in shutdown state ,then dont go to one second
sleep.
This commit is contained in:
Aditya A 2013-07-29 14:45:06 +05:30
parent 0c1ca4f0db
commit f7940e407a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/innobase/srv/srv0srv.c
View File

@ -2432,7 +2432,7 @@ loop:
by x100 (1purge/100msec), to speed up debug scripts by x100 (1purge/100msec), to speed up debug scripts
which should wait for purged. */ which should wait for purged. */
if (!skip_sleep) { if (!skip_sleep && !srv_shutdown_state) {
os_thread_sleep(100000); os_thread_sleep(100000);
} }
@ -2448,7 +2448,7 @@ loop:
} while (n_pages_purged); } while (n_pages_purged);
} else } else
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
if (!skip_sleep) { if (!skip_sleep && !srv_shutdown_state) {
os_thread_sleep(1000000); os_thread_sleep(1000000);
} }

4
storage/innodb_plugin/srv/srv0srv.c
View File

@ -2518,7 +2518,7 @@ loop:
by x100 (1purge/100msec), to speed up debug scripts by x100 (1purge/100msec), to speed up debug scripts
which should wait for purged. */ which should wait for purged. */
if (!skip_sleep) { if (!skip_sleep && !srv_shutdown_state) {
os_thread_sleep(100000); os_thread_sleep(100000);
srv_main_sleeps++; srv_main_sleeps++;
} }
@ -2535,7 +2535,7 @@ loop:
} while (n_pages_purged); } while (n_pages_purged);
} else } else
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
if (!skip_sleep) { if (!skip_sleep && !srv_shutdown_state) {
os_thread_sleep(1000000); os_thread_sleep(1000000);
srv_main_sleeps++; srv_main_sleeps++;