mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
540b2dc004
can crash under load
Backport from 5.1.
Does also include key cache fixes from:
Bug 44068 (RESTORE can disable the MyISAM Key Cache)
Bug 40944 (Backup: crash after myisampack)
include/keycache.h:
Bug#17332 - changing key_buffer_size on a running server
can crash under load
Added KEY_CACHE components in_resize and waiting_for_resize_cnt.
myisam/mi_preload.c:
Bug#17332 - changing key_buffer_size on a running server
can crash under load
Added code to allow LOAD INDEX to load indexes of different block size.
mysys/mf_keycache.c:
Bug#17332 - changing key_buffer_size on a running server
can crash under load
.
Changed resize_key_cache() to not disable the key cache
after the flush phase. Changed queue handling to use
standard functions. Wake all threads waiting on resize_queue.
We can now have read/write threads waiting there (see below).
.
Combined add_to_queue() and the wait loops that were always
following it to the new function wait_on_queue().
Combined release_queue() and the condition that was always
preceding it to the new function release_whole_queue().
.
Added code to flag and respect the exceptional situation
BLOCK_IN_EVICTION.
.
Rewrote the resize branch of find_key_block().
.
Added code to the eviction handling in find_key_block()
to catch more exceptional cases.
.
Changed key_cache_read(), key_cache_insert() and key_cache_write()
so that they lock keycache->cache_lock whenever the key cache is
initialized. Checking for a disabled cache and incrementing and
decrementing the "resize counter" is always done within the lock.
Locking and unlocking as well as counting the "resize counter" is
now done once outside the loop. All three functions can now handle
a NULL return from find_key_block. This happens in the flush phase
of a resize and demands direct file I/O. Care is taken for
secondary requests (PAGE_WAIT_TO_BE_READ) to wait in any case.
Moved block status changes behind the copying of buffer data.
key_cache_insert() does now read the block if the caller did
supply less data than a full cache block.
key_cache_write() does now take care of parallel running flushes
(BLOCK_FOR_UPDATE, BLOCK_IN_FLUSHWRITE).
.
Changed free_block() to un-initialize block variables in the
correct order and respect an exceptional BLOCK_IN_EVICTION state.
.
Changed flushing to take care for parallel running writes.
Changed flushing to avoid freeing blocks in eviction.
Changed flushing to consider that parallel writes can move blocks
from the file_blocks hash to the changed_blocks hash.
Changed flushing to take care for other parallel flushes.
Changed flushing to assure that it ends with everything flushed.
Optimized normal flush at end of statement (FLUSH_KEEP),
but let other flush types be stringent.
.
Added some comments and debugging statements.
mysys/my_static.c:
Bug#17332 - changing key_buffer_size on a running server
can crash under load
Removed an unused global variable.
sql/ha_myisam.cc:
Bug#17332 - changing key_buffer_size on a running server
can crash under load
Moved an automatic (stack) variable to the scope where it is used.
sql/sql_table.cc:
Bug#17332 - changing key_buffer_size on a running server
can crash under load
Changed TL_READ to TL_READ_NO_INSERT in mysql_preload_keys.
108 lines
3.6 KiB
C
108 lines
3.6 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
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 Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
Static variables for mysys library. All definied here for easy making of
|
|
a shared library
|
|
*/
|
|
|
|
#if !defined(stdin) || defined(OS2)
|
|
#include "mysys_priv.h"
|
|
#include "my_static.h"
|
|
#include "my_alarm.h"
|
|
#endif
|
|
|
|
my_bool timed_mutexes= 0;
|
|
|
|
/* from my_init */
|
|
my_string home_dir=0;
|
|
const char *my_progname=0;
|
|
char NEAR curr_dir[FN_REFLEN]= {0},
|
|
NEAR home_dir_buff[FN_REFLEN]= {0};
|
|
ulong my_stream_opened=0,my_file_opened=0, my_tmp_file_created=0;
|
|
int NEAR my_umask=0664, NEAR my_umask_dir=0777;
|
|
#ifndef THREAD
|
|
int NEAR my_errno=0;
|
|
#endif
|
|
struct st_my_file_info my_file_info_default[MY_NFILE]= {{0,UNOPEN}};
|
|
uint my_file_limit= MY_NFILE;
|
|
struct st_my_file_info *my_file_info= my_file_info_default;
|
|
|
|
/* From mf_brkhant */
|
|
int NEAR my_dont_interrupt=0;
|
|
volatile int _my_signals=0;
|
|
struct st_remember _my_sig_remember[MAX_SIGNALS]={{0,0}};
|
|
#ifdef THREAD
|
|
sigset_t my_signals; /* signals blocked by mf_brkhant */
|
|
#endif
|
|
|
|
/* from mf_reccache.c */
|
|
ulong my_default_record_cache_size=RECORD_CACHE_SIZE;
|
|
|
|
/* from soundex.c */
|
|
/* ABCDEFGHIJKLMNOPQRSTUVWXYZ */
|
|
/* :::::::::::::::::::::::::: */
|
|
const char *soundex_map= "01230120022455012623010202";
|
|
|
|
/* from my_malloc */
|
|
USED_MEM* my_once_root_block=0; /* pointer to first block */
|
|
uint my_once_extra=ONCE_ALLOC_INIT; /* Memory to alloc / block */
|
|
|
|
/* from my_largepage.c */
|
|
#ifdef HAVE_LARGE_PAGES
|
|
my_bool my_use_large_pages= 0;
|
|
uint my_large_page_size= 0;
|
|
#endif
|
|
|
|
/* from safe_malloc */
|
|
uint sf_malloc_prehunc=0, /* If you have problem with core- */
|
|
sf_malloc_endhunc=0, /* dump when malloc-message.... */
|
|
/* set theese to 64 or 128 */
|
|
sf_malloc_quick=0; /* set if no calls to sanity */
|
|
size_t sf_malloc_cur_memory= 0L; /* Current memory usage */
|
|
size_t sf_malloc_max_memory= 0L; /* Maximum memory usage */
|
|
uint sf_malloc_count= 0; /* Number of times NEW() was called */
|
|
byte *sf_min_adress= (byte*) ~(unsigned long) 0L,
|
|
*sf_max_adress= (byte*) 0L;
|
|
/* Root of the linked list of struct st_irem */
|
|
struct st_irem *sf_malloc_root = NULL;
|
|
|
|
/* from my_alarm */
|
|
int volatile my_have_got_alarm=0; /* declare variable to reset */
|
|
ulong my_time_to_wait_for_lock=2; /* In seconds */
|
|
|
|
/*
|
|
We need to have this define here as otherwise linking will fail
|
|
on OSF1 when compiling --without-raid --with-debug
|
|
*/
|
|
|
|
const char *raid_type_string[]={"none","striped"};
|
|
|
|
/* from errors.c */
|
|
#ifdef SHARED_LIBRARY
|
|
char * NEAR globerrs[GLOBERRS]; /* my_error_messages is here */
|
|
#endif
|
|
void (*my_abort_hook)(int) = (void(*)(int)) exit;
|
|
int (*error_handler_hook)(uint error,const char *str,myf MyFlags)=
|
|
my_message_no_curses;
|
|
int (*fatal_error_handler_hook)(uint error,const char *str,myf MyFlags)=
|
|
my_message_no_curses;
|
|
|
|
/* How to disable options */
|
|
my_bool NEAR my_disable_locking=0;
|
|
my_bool NEAR my_disable_async_io=0;
|
|
my_bool NEAR my_disable_flush_key_blocks=0;
|
|
my_bool NEAR my_disable_symlinks=0;
|
|
my_bool NEAR mysys_uses_curses=0;
|