mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
26565ae1d6
- Fix for LP#700623 "Aria recovery: ma_blockrec.c:3930: _ma_update_at_original_place: Assertion `block->org_bitmap_value == _ma_bitmap_get_page_bits(info, &info->s->bitmap, page)' failed" - Issue was that when deleting a tail page where all index entries where full, the page was marked wrongly in the bitmap. - If debug_assert_if_crashed_table is set, we now crash when we find Aria corrupted. - Write more information if we find something wrong with the bitmap. - Fixed that REPAIR also can fix wrong create_rename_lsn issues (a very unlikely event) - Define STATE_CRASHED_FLAGS as set of all CRASHED flags (to simplify code) storage/maria/ha_maria.cc: Mark the normal page cache (not the page cache for the logs) so that we can request extra debugging for it. Copy the value of debug_assert_if_crashed_table to maria_assert_if_crashed_table so that we can request a crash at exactly the point where we find Aria corrupted. Use STATE_CRASHED_FLAGS storage/maria/ma_bitmap.c: Made bits_to_txt extern so that we can use this in maria_chk Added extra information to the log files to be able to easier find bitmap failures in recovery. (When compiling with -DEXTRA_DEBUG_BITMAP) Added _ma_get_bitmap_description() to request a clear text description of the bitmap. Simplify _ma_check_bitmap_data(), as we know the bitmap pattern in the caller. storage/maria/ma_blockrec.c: In delete_head_or_tail(), fixed a bug where we sent wrong information to _ma_bitmap_set() if the directory was full for a page that should be freed. This fixed LP#700623 (failure in bitmap found during recovery) storage/maria/ma_blockrec.h: Added definitions for _ma_get_bitmap_description() and bits_to_txt storage/maria/ma_check.c: Simplify call to _ma_check_bitmap_data(). Write more information if we find something wrong with the bitmap. Moved getting clear text information about the bitmap to ma_bitmap.c::_ma_get_bitmap_description() storage/maria/ma_checkpoint.c: More asserts storage/maria/ma_create.c: Fix wrong create_rename_lsn during repair. (Create_rename_lsn can be too big if someone restores an old maria_log_file after an Aria file was created) storage/maria/ma_delete.c: Call _ma_set_fatal_error() in case of crashed file Remove not needed test of save_errno == HA_ERR_KEY_NOT_FOUND. (Handled by other code storage/maria/ma_extra.c: Call _ma_set_fatal_error() in case of crashed file Reset share->bitmap.changed_not_flushed to not cause new ASSERTS to trigger. Added _ma_file_callback_to_id() for writing share->id to log file in case of DEBUG logging. storage/maria/ma_init.c: Destroy also translog if it's readonly (as when called by maria_read_log -d) storage/maria/ma_key.c: Call _ma_set_fatal_error() in case of crashed file storage/maria/ma_key_recover.c: STATE_CRASHED -> STATE_CRASHED_FLAGS storage/maria/ma_keycache.c: Call _ma_set_fatal_error() in case of crashed file storage/maria/ma_locking.c: Call _ma_set_fatal_error() in case of crashed file. Added _ma_set_fatal_error() storage/maria/ma_open.c: Call _ma_set_fatal_error() in case of crashed file storage/maria/ma_page.c: Call _ma_set_fatal_error() in case of crashed file storage/maria/ma_pagecache.c: Added extra information to log file to simply debugging of bitmap errors. storage/maria/ma_pagecache.h: Added extra_debug flag to allow marking of row and index cache for extra logging (for debugging). storage/maria/ma_panic.c: Flush both data and index blocks in case of HA_PANIC_CLOSE Fixed wrong position of 'break'. (Not critical for MariaDB as MariaDB never uses this code) storage/maria/ma_recovery_util.c: Avoid writing extra not needed \n to DBUG log. storage/maria/ma_rkey.c: Call _ma_set_fatal_error() in case of crashed file storage/maria/ma_search.c: Call _ma_set_fatal_error() in case of crashed file storage/maria/ma_static.c: Define maria_assert_if_crashed_table storage/maria/ma_update.c: Call _ma_set_fatal_error() in case of crashed file. The new code also avoids a problem where we before would print the error twice. storage/maria/ma_write.c: Call _ma_set_fatal_error() in case of crashed file storage/maria/maria_chk.c: STATE_CRASHED -> STATE_CRASHED_FLAGS storage/maria/maria_def.h: Added STATE_CRASHED_PRINTED to avoid giving error message about crash twice. Added STATE_CRASHED_FLAGS to be able to easily detect and set all CRASHED related flags. Added prototypes for new functions. storage/myisam/mi_panic.c: Fixed wrong position of 'break'. (Not critical for MariaDB as MariaDB never uses this code)
164 lines
5.3 KiB
C
164 lines
5.3 KiB
C
/* Copyright (C) 2006 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 */
|
|
|
|
/*
|
|
Key cache assignments
|
|
*/
|
|
|
|
#include "maria_def.h"
|
|
|
|
/*
|
|
Assign pages of the index file for a table to a key cache
|
|
|
|
SYNOPSIS
|
|
maria_assign_to_pagecache()
|
|
info open table
|
|
key_map map of indexes to assign to the key cache
|
|
pagecache_ptr pointer to the key cache handle
|
|
assign_lock Mutex to lock during assignment
|
|
|
|
PREREQUESTS
|
|
One must have a READ lock or a WRITE lock on the table when calling
|
|
the function to ensure that there is no other writers to it.
|
|
|
|
The caller must also ensure that one doesn't call this function from
|
|
two different threads with the same table.
|
|
|
|
NOTES
|
|
At present pages for all indexes must be assigned to the same key cache.
|
|
In future only pages for indexes specified in the key_map parameter
|
|
of the table will be assigned to the specified key cache.
|
|
|
|
RETURN VALUE
|
|
0 If a success
|
|
# Error code
|
|
*/
|
|
|
|
int maria_assign_to_pagecache(MARIA_HA *info,
|
|
ulonglong key_map __attribute__((unused)),
|
|
PAGECACHE *pagecache)
|
|
{
|
|
int error= 0;
|
|
MARIA_SHARE* share= info->s;
|
|
DBUG_ENTER("maria_assign_to_pagecache");
|
|
DBUG_PRINT("enter",
|
|
("old_pagecache_handle: 0x%lx new_pagecache_handle: 0x%lx",
|
|
(long) share->pagecache, (long) pagecache));
|
|
|
|
/*
|
|
Skip operation if we didn't change key cache. This can happen if we
|
|
call this for all open instances of the same table
|
|
*/
|
|
if (share->pagecache == pagecache)
|
|
DBUG_RETURN(0);
|
|
|
|
/*
|
|
First flush all blocks for the table in the old key cache.
|
|
This is to ensure that the disk is consistent with the data pages
|
|
in memory (which may not be the case if the table uses delayed_key_write)
|
|
|
|
Note that some other read thread may still fill in the key cache with
|
|
new blocks during this call and after, but this doesn't matter as
|
|
all threads will start using the new key cache for their next call to
|
|
maria library and we know that there will not be any changed blocks
|
|
in the old key cache.
|
|
*/
|
|
|
|
if (flush_pagecache_blocks(share->pagecache, &share->kfile, FLUSH_RELEASE))
|
|
{
|
|
error= my_errno;
|
|
/* Mark that table must be checked */
|
|
_ma_set_fatal_error(share, error);
|
|
}
|
|
|
|
/*
|
|
Flush the new key cache for this file. This is needed to ensure
|
|
that there is no old blocks (with outdated data) left in the new key
|
|
cache from an earlier assign_to_keycache operation
|
|
|
|
(This can never fail as there is never any not written data in the
|
|
new key cache)
|
|
*/
|
|
(void) flush_pagecache_blocks(pagecache, &share->kfile, FLUSH_RELEASE);
|
|
|
|
/*
|
|
ensure that setting the key cache and changing the multi_pagecache
|
|
is done atomicly
|
|
*/
|
|
pthread_mutex_lock(&share->intern_lock);
|
|
/*
|
|
Tell all threads to use the new key cache
|
|
This should be seen at the lastes for the next call to an maria function.
|
|
*/
|
|
share->pagecache= pagecache;
|
|
|
|
/* store the key cache in the global hash structure for future opens */
|
|
if (multi_pagecache_set((uchar*) share->unique_file_name.str,
|
|
share->unique_file_name.length,
|
|
share->pagecache))
|
|
error= my_errno;
|
|
pthread_mutex_unlock(&share->intern_lock);
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/*
|
|
Change all MARIA entries that uses one key cache to another key cache
|
|
|
|
SYNOPSIS
|
|
maria_change_pagecache()
|
|
old_pagecache Old key cache
|
|
new_pagecache New key cache
|
|
|
|
NOTES
|
|
This is used when we delete one key cache.
|
|
|
|
To handle the case where some other threads tries to open an MARIA
|
|
table associated with the to-be-deleted key cache while this operation
|
|
is running, we have to call 'multi_pagecache_change()' from this
|
|
function while we have a lock on the MARIA table list structure.
|
|
|
|
This is safe as long as it's only MARIA that is using this specific
|
|
key cache.
|
|
*/
|
|
|
|
|
|
void maria_change_pagecache(PAGECACHE *old_pagecache,
|
|
PAGECACHE *new_pagecache)
|
|
{
|
|
LIST *pos;
|
|
DBUG_ENTER("maria_change_pagecache");
|
|
|
|
/*
|
|
Lock list to ensure that no one can close the table while we manipulate it
|
|
*/
|
|
pthread_mutex_lock(&THR_LOCK_maria);
|
|
for (pos=maria_open_list ; pos ; pos=pos->next)
|
|
{
|
|
MARIA_HA *info= (MARIA_HA*) pos->data;
|
|
MARIA_SHARE *share= info->s;
|
|
if (share->pagecache == old_pagecache)
|
|
maria_assign_to_pagecache(info, (ulonglong) ~0, new_pagecache);
|
|
}
|
|
|
|
/*
|
|
We have to do the following call while we have the lock on the
|
|
MARIA list structure to ensure that another thread is not trying to
|
|
open a new table that will be associted with the old key cache
|
|
*/
|
|
multi_pagecache_change(old_pagecache, new_pagecache);
|
|
pthread_mutex_unlock(&THR_LOCK_maria);
|
|
DBUG_VOID_RETURN;
|
|
}
|