diff options
| -rw-r--r-- | storage/innobase/buf/buf0mtflu.cc | 28 | ||||
| -rw-r--r-- | storage/innobase/os/os0file.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/srv/srv0start.cc | 5 | ||||
| -rw-r--r-- | storage/xtradb/buf/buf0mtflu.cc | 61 | ||||
| -rw-r--r-- | storage/xtradb/os/os0file.cc | 4 | ||||
| -rw-r--r-- | storage/xtradb/srv/srv0start.cc | 4 |
6 files changed, 56 insertions, 50 deletions
diff --git a/storage/innobase/buf/buf0mtflu.cc b/storage/innobase/buf/buf0mtflu.cc index c14f9048ae5..e990ba785e7 100644 --- a/storage/innobase/buf/buf0mtflu.cc +++ b/storage/innobase/buf/buf0mtflu.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (C) 2013, 2014, Fusion-io. All Rights Reserved. -Copyright (C) 2013, 2014, SkySQL Ab. All Rights Reserved. +Copyright (C) 2013, 2015, MariaDB Corporation. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -202,6 +202,7 @@ buf_mtflu_flush_pool_instance( return 0; } + memset(&n, 0, sizeof(flush_counters_t)); if (work_item->wr.flush_type == BUF_FLUSH_LRU) { /* srv_LRU_scan_depth can be arbitrarily large value. @@ -379,9 +380,6 @@ buf_mtflu_io_thread_exit(void) mtflush_io->gwt_status = WTHR_KILL_IT; - fprintf(stderr, "InnoDB: [Note]: Signal mtflush_io_threads to exit [%lu]\n", - srv_mtflush_threads); - /* This lock is to safequard against timing bug: flush request take this mutex before sending work items to be processed by flush threads. Inside flush thread we assume that work queue contains only @@ -409,6 +407,9 @@ buf_mtflu_io_thread_exit(void) mtflush_io->wheap); } + /* Requests sent */ + os_fast_mutex_unlock(&mtflush_mtx); + /* Wait until all work items on a work queue are processed */ while(!ib_wqueue_is_empty(mtflush_io->wq)) { /* Wait */ @@ -433,11 +434,14 @@ buf_mtflu_io_thread_exit(void) /* Wait about 1/2 sec to allow threads really exit */ os_thread_sleep(MT_WAIT_IN_USECS); + /* Make sure that work queue is empty */ while(!ib_wqueue_is_empty(mtflush_io->wq)) { ib_wqueue_nowait(mtflush_io->wq); } + os_fast_mutex_lock(&mtflush_mtx); + ut_a(ib_wqueue_is_empty(mtflush_io->wq)); ut_a(ib_wqueue_is_empty(mtflush_io->wr_cq)); ut_a(ib_wqueue_is_empty(mtflush_io->rd_cq)); @@ -447,14 +451,18 @@ buf_mtflu_io_thread_exit(void) ib_wqueue_free(mtflush_io->wr_cq); ib_wqueue_free(mtflush_io->rd_cq); - /* Requests sent */ - os_fast_mutex_unlock(&mtflush_mtx); - os_fast_mutex_free(&mtflush_mtx); - os_fast_mutex_free(&mtflush_io->thread_global_mtx); + mtflush_io->wq = NULL; + mtflush_io->wr_cq = NULL; + mtflush_io->rd_cq = NULL; + mtflush_work_initialized = 0; /* Free heap */ mem_heap_free(mtflush_io->wheap); mem_heap_free(mtflush_io->rheap); + + os_fast_mutex_unlock(&mtflush_mtx); + os_fast_mutex_free(&mtflush_mtx); + os_fast_mutex_free(&mtflush_io->thread_global_mtx); } /******************************************************************//** @@ -541,6 +549,10 @@ buf_mtflu_flush_work_items( mem_heap_t* reply_heap; wrk_t work_item[MTFLUSH_MAX_WORKER]; + if (mtflush_ctx->gwt_status == WTHR_KILL_IT) { + return 0; + } + /* Allocate heap where all work items used and queue node items areallocated */ work_heap = mem_heap_create(0); diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index d0025b829ec..1f013a622ff 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -1919,7 +1919,7 @@ os_file_create_func( try to set atomic writes and if that fails when creating a new table, produce a error. If atomic writes are used on existing file, ignore error and use traditional writes for that file */ - if (file != INVALID_HANDLE_VALUE + if (file != INVALID_HANDLE_VALUE && type == OS_DATA_FILE && (awrites == ATOMIC_WRITES_ON || (srv_use_atomic_writes && awrites == ATOMIC_WRITES_DEFAULT)) && !os_file_set_atomic_writes(name, file)) { @@ -2065,7 +2065,7 @@ os_file_create_func( try to set atomic writes and if that fails when creating a new table, produce a error. If atomic writes are used on existing file, ignore error and use traditional writes for that file */ - if (file != -1 + if (file != -1 && type == OS_DATA_FILE && (awrites == ATOMIC_WRITES_ON || (srv_use_atomic_writes && awrites == ATOMIC_WRITES_DEFAULT)) && !os_file_set_atomic_writes(name, file)) { diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 2692636dcb5..fe16f40a9d6 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -2741,11 +2741,6 @@ files_checked: srv_mtflush_threads, mtflush_ctx, (thread_ids + 6 + 32)); - -#if UNIV_DEBUG - fprintf(stderr, "InnoDB: Note: %s:%d buf-pool-instances:%lu mtflush_threads %lu\n", - __FILE__, __LINE__, srv_buf_pool_instances, srv_mtflush_threads); -#endif } os_thread_create(buf_flush_page_cleaner_thread, NULL, NULL); diff --git a/storage/xtradb/buf/buf0mtflu.cc b/storage/xtradb/buf/buf0mtflu.cc index f3040c0adc9..f0480cfc169 100644 --- a/storage/xtradb/buf/buf0mtflu.cc +++ b/storage/xtradb/buf/buf0mtflu.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (C) 2013, 2014, Fusion-io. All Rights Reserved. -Copyright (C) 2013, 2014, SkySQL Ab. All Rights Reserved. +Copyright (C) 2013, 2015, MariaDB Corporation. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -182,12 +182,9 @@ buf_mtflu_flush_pool_instance( wrk_t *work_item) /*!< inout: work item to be flushed */ { flush_counters_t n; - ut_a(work_item != NULL); ut_a(work_item->wr.buf_pool != NULL); - memset(&n, 0, sizeof(flush_counters_t)); - if (!buf_flush_start(work_item->wr.buf_pool, work_item->wr.flush_type)) { /* We have two choices here. If lsn_limit was specified then skipping an instance of buffer @@ -205,6 +202,7 @@ buf_mtflu_flush_pool_instance( return 0; } + memset(&n, 0, sizeof(flush_counters_t)); if (work_item->wr.flush_type == BUF_FLUSH_LRU) { /* srv_LRU_scan_depth can be arbitrarily large value. @@ -217,14 +215,13 @@ buf_mtflu_flush_pool_instance( } buf_flush_batch(work_item->wr.buf_pool, - work_item->wr.flush_type, - work_item->wr.min, - work_item->wr.lsn_limit, - false, - &n); + work_item->wr.flush_type, + work_item->wr.min, + work_item->wr.lsn_limit, + false, + &n); work_item->n_flushed = n.flushed; - buf_flush_end(work_item->wr.buf_pool, work_item->wr.flush_type); buf_flush_common(work_item->wr.flush_type, work_item->n_flushed); @@ -254,7 +251,7 @@ mtflush_service_io( work_item = (wrk_t *)ib_wqueue_nowait(mtflush_io->wq); if (work_item == NULL) { - work_item = (wrk_t *)ib_wqueue_timedwait(mtflush_io->wq, MT_WAIT_IN_USECS); + work_item = (wrk_t *)ib_wqueue_wait(mtflush_io->wq); } if (work_item) { @@ -341,10 +338,10 @@ DECLARE_THREAD(mtflush_io_thread)( while (TRUE) { #ifdef UNIV_MTFLUSH_DEBUG - fprintf(stderr, "InnoDB: Note. Thread %lu work queue len %lu return queue len %lu\n", - os_thread_get_curr_id(), - ib_wqueue_len(mtflush_io->wq), - ib_wqueue_len(mtflush_io->wr_cq)); + fprintf(stderr, "InnoDB: Note. Thread %lu work queue len %lu return queue len %lu\n", + os_thread_get_curr_id(), + ib_wqueue_len(mtflush_io->wq), + ib_wqueue_len(mtflush_io->wr_cq)); #endif /* UNIV_MTFLUSH_DEBUG */ mtflush_service_io(mtflush_io, this_thread_data); @@ -383,9 +380,6 @@ buf_mtflu_io_thread_exit(void) mtflush_io->gwt_status = WTHR_KILL_IT; - fprintf(stderr, "InnoDB: [Note]: Signal mtflush_io_threads to exit [%lu]\n", - srv_mtflush_threads); - /* This lock is to safequard against timing bug: flush request take this mutex before sending work items to be processed by flush threads. Inside flush thread we assume that work queue contains only @@ -397,6 +391,9 @@ buf_mtflu_io_thread_exit(void) os_fast_mutex_lock(&mtflush_mtx); + /* Make sure the work queue is empty */ + ut_a(ib_wqueue_is_empty(mtflush_io->wq)); + /* Send one exit work item/thread */ for (i=0; i < (ulint)srv_mtflush_threads; i++) { work_item[i].tsk = MT_WRK_NONE; @@ -410,6 +407,9 @@ buf_mtflu_io_thread_exit(void) mtflush_io->wheap); } + /* Requests sent */ + os_fast_mutex_unlock(&mtflush_mtx); + /* Wait until all work items on a work queue are processed */ while(!ib_wqueue_is_empty(mtflush_io->wq)) { /* Wait */ @@ -434,15 +434,13 @@ buf_mtflu_io_thread_exit(void) /* Wait about 1/2 sec to allow threads really exit */ os_thread_sleep(MT_WAIT_IN_USECS); + /* Make sure that work queue is empty */ while(!ib_wqueue_is_empty(mtflush_io->wq)) { ib_wqueue_nowait(mtflush_io->wq); } - while(!ib_wqueue_is_empty(mtflush_io->wq)) - { - ib_wqueue_nowait(mtflush_io->wq); - } + os_fast_mutex_lock(&mtflush_mtx); ut_a(ib_wqueue_is_empty(mtflush_io->wq)); ut_a(ib_wqueue_is_empty(mtflush_io->wr_cq)); @@ -453,14 +451,18 @@ buf_mtflu_io_thread_exit(void) ib_wqueue_free(mtflush_io->wr_cq); ib_wqueue_free(mtflush_io->rd_cq); - /* Requests sent */ - os_fast_mutex_unlock(&mtflush_mtx); - os_fast_mutex_free(&mtflush_mtx); - os_fast_mutex_free(&mtflush_io->thread_global_mtx); + mtflush_io->wq = NULL; + mtflush_io->wr_cq = NULL; + mtflush_io->rd_cq = NULL; + mtflush_work_initialized = 0; /* Free heap */ mem_heap_free(mtflush_io->wheap); mem_heap_free(mtflush_io->rheap); + + os_fast_mutex_unlock(&mtflush_mtx); + os_fast_mutex_free(&mtflush_mtx); + os_fast_mutex_free(&mtflush_io->thread_global_mtx); } /******************************************************************//** @@ -547,6 +549,10 @@ buf_mtflu_flush_work_items( mem_heap_t* reply_heap; wrk_t work_item[MTFLUSH_MAX_WORKER]; + if (mtflush_ctx->gwt_status == WTHR_KILL_IT) { + return 0; + } + /* Allocate heap where all work items used and queue node items areallocated */ work_heap = mem_heap_create(0); @@ -597,9 +603,6 @@ buf_mtflu_flush_work_items( } } - ut_a(ib_wqueue_is_empty(mtflush_ctx->wq)); - ut_a(ib_wqueue_is_empty(mtflush_ctx->wr_cq)); - /* Release used work_items and queue nodes */ mem_heap_free(work_heap); mem_heap_free(reply_heap); diff --git a/storage/xtradb/os/os0file.cc b/storage/xtradb/os/os0file.cc index 9bf1046822e..ce8682ba86f 100644 --- a/storage/xtradb/os/os0file.cc +++ b/storage/xtradb/os/os0file.cc @@ -2037,7 +2037,7 @@ os_file_create_func( try to set atomic writes and if that fails when creating a new table, produce a error. If atomic writes are used on existing file, ignore error and use traditional writes for that file */ - if (file != INVALID_HANDLE_VALUE + if (file != INVALID_HANDLE_VALUE && type == OS_DATA_FILE && (awrites == ATOMIC_WRITES_ON || (srv_use_atomic_writes && awrites == ATOMIC_WRITES_DEFAULT)) && !os_file_set_atomic_writes(name, file)) { @@ -2186,7 +2186,7 @@ os_file_create_func( try to set atomic writes and if that fails when creating a new table, produce a error. If atomic writes are used on existing file, ignore error and use traditional writes for that file */ - if (file != -1 + if (file != -1 && type == OS_DATA_FILE && (awrites == ATOMIC_WRITES_ON || (srv_use_atomic_writes && awrites == ATOMIC_WRITES_DEFAULT)) && !os_file_set_atomic_writes(name, file)) { diff --git a/storage/xtradb/srv/srv0start.cc b/storage/xtradb/srv/srv0start.cc index c76cbb8a320..760e6af1f69 100644 --- a/storage/xtradb/srv/srv0start.cc +++ b/storage/xtradb/srv/srv0start.cc @@ -2815,10 +2815,6 @@ files_checked: srv_mtflush_threads, mtflush_ctx, (thread_ids + 6 + SRV_MAX_N_PURGE_THREADS)); -#if UNIV_DEBUG - fprintf(stderr, "InnoDB: Note: %s:%d buf-pool-instances:%lu mtflush_threads %lu\n", - __FILE__, __LINE__, srv_buf_pool_instances, srv_mtflush_threads); -#endif } |