mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Addresses #1510 Improved concurrency of checkpoint (end) function

Browse source 
git-svn-id: file:///svn/toku/tokudb@11113 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Yoni Fogel 2013-04-16 23:57:47 -04:00
parent 6561bd1af8
commit 6f213717c3
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
newbrt/brt.c
View file

@ -3186,8 +3186,10 @@ toku_brtheader_end_checkpoint (CACHEFILE cachefile, void *header_v) {
}
toku_block_translation_note_end_checkpoint(h->blocktable, h);
}
if (h->checkpoint_header) brtheader_free(h->checkpoint_header);
h->checkpoint_header = NULL;
if (h->checkpoint_header) { // could be NULL only if panic was true at begin_checkpoint
brtheader_free(h->checkpoint_header);
h->checkpoint_header = NULL;
}
return r;
}

8
newbrt/cachetable.c
View file

@ -1470,8 +1470,11 @@ toku_cachetable_end_checkpoint(CACHETABLE ct, TOKULOGGER logger, char **error_st
}
assert(!ct->pending_head);
cachetable_unlock(ct);
{ // have just written data blocks, so next write the translation and header for each open dictionary
CACHEFILE cf;
//cachefiles_in_checkpoint is protected by the checkpoint_safe_lock
for (cf = ct->cachefiles_in_checkpoint; cf; cf=cf->next_in_checkpoint) {
if (cf->checkpoint_userdata) {
int r = cf->checkpoint_userdata(cf, cf->userdata);
@ -1484,6 +1487,7 @@ toku_cachetable_end_checkpoint(CACHETABLE ct, TOKULOGGER logger, char **error_st
// ... so fsync and call checkpoint-end function in block translator
// to free obsolete blocks on disk used by previous checkpoint
CACHEFILE cf;
//cachefiles_in_checkpoint is protected by the checkpoint_safe_lock
for (cf = ct->cachefiles_in_checkpoint; cf; cf=cf->next_in_checkpoint) {
if (cf->end_checkpoint_userdata) {
int r = cf->end_checkpoint_userdata(cf, cf->userdata);
@ -1497,20 +1501,18 @@ toku_cachetable_end_checkpoint(CACHETABLE ct, TOKULOGGER logger, char **error_st
//remove reference
//clear bit saying they're in checkpoint
CACHEFILE cf;
//cachefiles_in_checkpoint is protected by the checkpoint_safe_lock
while ((cf = ct->cachefiles_in_checkpoint)) {
ct->cachefiles_in_checkpoint = cf->next_in_checkpoint;
cf->next_in_checkpoint = NULL;
cf->for_checkpoint = FALSE;
cachetable_unlock(ct);
int r = toku_cachefile_close(&cf, logger, error_string);
if (r!=0) {
retval = r;
goto panic;
}
cachetable_lock(ct);
}
}
cachetable_unlock(ct);
if (logger) {
int r = toku_log_end_checkpoint(logger, NULL, 0, ct->lsn_of_checkpoint_in_progress.lsn);