mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

recover from a big malloc failure in the middle of a rowset sort. merge -c 20283. refs[t:2603]

Browse source 
git-svn-id: file:///svn/toku/tokudb@20284 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Rich Prohaska 2013-04-16 23:59:12 -04:00 • committed by Yoni Fogel
parent fbc02dfbec
commit d517a39ce5
2 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
newbrt/brtloader.c
View file

@ -1109,7 +1109,8 @@ int mergesort_row_array (struct row rows[/*n*/], int n, int which_db, DB *dest_d
if (r1!=0) return r1;
if (r2!=0) return r2;
struct row *MALLOC_N(n, tmp); assert(tmp); // LAZY
struct row *MALLOC_N(n, tmp);
if (tmp == NULL) return errno;
{
int r = merge_row_arrays(tmp, rows, mid, rows+mid, n-mid, which_db, dest_db, compare, bl, rowset);
if (r!=0) {
@ -1868,12 +1869,13 @@ static int write_translation_table (struct dbout *out, long long *off_of_transla
static int write_header (struct dbout *out, long long translation_location_on_disk, long long translation_size_on_disk, BLOCKNUM root_blocknum_on_disk, LSN load_lsn);
static void drain_writer_q(QUEUE q) {
struct rowset *rowset;
void *item;
while (1) {
int r = queue_deq(q, (void *) &rowset, NULL, NULL);
int r = queue_deq(q, &item, NULL, NULL);
if (r == EOF)
break;
assert(r == 0);
struct rowset *rowset = (struct rowset *) item;
destroy_rowset(rowset);
toku_free(rowset);
}

38
newbrt/tests/brtloader-test-extractor-errors.c
View file

@ -76,20 +76,24 @@ static void reset_my_malloc_counts(void) {
static void *my_malloc(size_t n) {
void *caller = __builtin_return_address(0);
if ((void*)toku_malloc <= caller && caller <= (void*)toku_xcalloc) {
my_malloc_count++;
if (n >= 64*1024) {
my_big_malloc_count++;
if (my_malloc_event) {
event_count++;
if (event_count == event_count_trigger) {
event_hit();
errno = ENOMEM;
return NULL;
}
if (!((void*)toku_malloc <= caller && caller <= (void*)toku_free))
goto skip;
my_malloc_count++;
if (n >= 64*1024) {
my_big_malloc_count++;
if (my_malloc_event) {
caller = __builtin_return_address(1);
if ((void*)toku_xmalloc <= caller && caller <= (void*)toku_malloc_report)
goto skip;
event_count++;
if (event_count == event_count_trigger) {
event_hit();
errno = ENOMEM;
return NULL;
}
}
}
skip:
return malloc(n);
}
@ -208,6 +212,7 @@ static int usage(const char *progname) {
int test_main (int argc, const char *argv[]) {
const char *progname=argv[0];
int max_error_limit = -1;
argc--; argv++;
while (argc>0) {
if (strcmp(argv[0],"-h")==0) {
@ -226,6 +231,9 @@ int test_main (int argc, const char *argv[]) {
toku_brtloader_set_size_factor(1);
} else if (strcmp(argv[0],"-m") == 0) {
my_malloc_event = 1;
} else if (strcmp(argv[0],"--max_error_limit") == 0 && argc >= 1) {
argc--; argv++;
max_error_limit = atoi(argv[0]);
} else if (argc!=1) {
return usage(progname);
exit(1);
@ -240,10 +248,12 @@ int test_main (int argc, const char *argv[]) {
test_extractor(nrows, nrowsets, FALSE);
// run tests
int write_error_limit = event_count;
if (verbose) printf("write_error_limit=%d\n", write_error_limit);
int error_limit = event_count;
if (verbose) printf("error_limit=%d\n", error_limit);
for (int i = 1; i <= write_error_limit; i++) {
if (max_error_limit != -1 && error_limit > max_error_limit)
error_limit = max_error_limit;
for (int i = 1; i <= error_limit; i++) {
reset_event_counts();
reset_my_malloc_counts();
event_count_trigger = i;