diff options
| author | Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com> | 2012-04-27 19:40:12 +0900 |
|---|---|---|
| committer | Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com> | 2012-04-27 19:40:12 +0900 |
| commit | 96b62513f693e2f34ca6931002b30e5694975883 (patch) | |
| tree | 6601fb0b70e3d584464ff49f619eb0787651a755 /storage | |
| parent | 02522904bc28703ff7130db2a34d3e38edf2a8e4 (diff) | |
| parent | 08e7444e549722f61dd90fdf23ce05632c72044e (diff) | |
| download | mariadb-git-96b62513f693e2f34ca6931002b30e5694975883.tar.gz | |
Bug#11758510 (#50723): INNODB CHECK TABLE FATAL SEMAPHORE WAIT TIMEOUT POSSIBLY TOO SHORT FOR BI
Fixed not to check timeout during the check table.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/dict/dict0load.c | 4 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/include/srv0srv.h | 1 | ||||
| -rw-r--r-- | storage/innobase/sync/sync0arr.c | 5 |
4 files changed, 10 insertions, 4 deletions
diff --git a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.c index 9828326dde1..f8df2310d83 100644 --- a/storage/innobase/dict/dict0load.c +++ b/storage/innobase/dict/dict0load.c @@ -177,7 +177,7 @@ dict_print(void) monitor printout */ mutex_enter(&kernel_mutex); - srv_fatal_semaphore_wait_threshold += 7200; /* 2 hours */ + srv_fatal_semaphore_wait_threshold += SRV_SEMAPHORE_WAIT_EXTENSION; mutex_exit(&kernel_mutex); heap = mem_heap_create(1000); @@ -214,7 +214,7 @@ dict_print(void) /* Restore the fatal semaphore wait timeout */ mutex_enter(&kernel_mutex); - srv_fatal_semaphore_wait_threshold -= 7200; /* 2 hours */ + srv_fatal_semaphore_wait_threshold -= SRV_SEMAPHORE_WAIT_EXTENSION; mutex_exit(&kernel_mutex); } diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 9679a901e20..6ef2b7b3a0d 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -8464,7 +8464,7 @@ ha_innobase::check( /* Enlarge the fatal lock wait timeout during CHECK TABLE. */ mutex_enter(&kernel_mutex); - srv_fatal_semaphore_wait_threshold += 7200; /* 2 hours */ + srv_fatal_semaphore_wait_threshold += SRV_SEMAPHORE_WAIT_EXTENSION; mutex_exit(&kernel_mutex); for (index = dict_table_get_first_index(prebuilt->table); @@ -8605,7 +8605,7 @@ ha_innobase::check( /* Restore the fatal lock wait timeout after CHECK TABLE. */ mutex_enter(&kernel_mutex); - srv_fatal_semaphore_wait_threshold -= 7200; /* 2 hours */ + srv_fatal_semaphore_wait_threshold -= SRV_SEMAPHORE_WAIT_EXTENSION; mutex_exit(&kernel_mutex); prebuilt->trx->op_info = ""; diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h index 2c901d2cf96..ed2f4672a99 100644 --- a/storage/innobase/include/srv0srv.h +++ b/storage/innobase/include/srv0srv.h @@ -262,6 +262,7 @@ extern ibool srv_print_latch_waits; extern ulint srv_activity_count; extern ulint srv_fatal_semaphore_wait_threshold; +#define SRV_SEMAPHORE_WAIT_EXTENSION 7200 extern ulint srv_dml_needed_delay; extern mutex_t* kernel_mutex_temp;/* mutex protecting the server, trx structs, diff --git a/storage/innobase/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c index 30caddccced..c6cbfc94dca 100644 --- a/storage/innobase/sync/sync0arr.c +++ b/storage/innobase/sync/sync0arr.c @@ -928,6 +928,11 @@ sync_array_print_long_waits( ibool fatal = FALSE; double longest_diff = 0; + /* For huge tables, skip the check during CHECK TABLE etc... */ + if (fatal_timeout > SRV_SEMAPHORE_WAIT_EXTENSION) { + return(FALSE); + } + #ifdef UNIV_DEBUG_VALGRIND /* Increase the timeouts if running under valgrind because it executes extremely slowly. UNIV_DEBUG_VALGRIND does not necessary mean that |