Browse Source
Improve error messages and error handling when writes fail.
Improve error messages and error handling when writes fail.
* Fixes #78 ({{{lg_bsize}}} works) * Fixes #1323 (write errors) Did {{{ svn merge -r8967:9031 https://svn.tokutek.com/tokudb/toku/tokudb.1323a }}} (And I'll delete the 1323 branches in a moment.) git-svn-id: file:///svn/toku/tokudb@9032 c7de825b-a66e-492c-adef-691d508d4ae1pull/73/head
Bradley C. Kuszmaul
13 years ago
committed by
Yoni Fogel
Yoni Fogel
59 changed files with 563 additions and 195 deletions
-
4buildheader/db.h_4_1
-
4buildheader/db.h_4_3
-
4buildheader/db.h_4_4
-
4buildheader/db.h_4_5
-
4buildheader/db.h_4_6
-
4buildheader/make_db_h.c
-
2db-benchmark-test/db-benchmark-test.c
-
4include/db.h
-
25linux/file.c
-
6newbrt/brt-internal.h
-
108newbrt/brt-serialize.c
-
49newbrt/brt.c
-
4newbrt/brt.h
-
21newbrt/cachetable.c
-
4newbrt/cachetable.h
-
1newbrt/log-internal.h
-
12newbrt/log.c
-
1newbrt/log.h
-
8newbrt/recover.c
-
6newbrt/roll.c
-
2newbrt/tests/benchmark-test.c
-
1newbrt/tests/brt-serialize-test.c
-
2newbrt/tests/brt-test-cursor-2.c
-
28newbrt/tests/brt-test-cursor.c
-
4newbrt/tests/brt-test-named-db.c
-
68newbrt/tests/brt-test.c
-
2newbrt/tests/brt-test0.c
-
2newbrt/tests/brt-test1.c
-
2newbrt/tests/brt-test2.c
-
2newbrt/tests/brt-test3.c
-
2newbrt/tests/brt-test4.c
-
2newbrt/tests/brt-test5.c
-
2newbrt/tests/cachetable-count-pinned-test.c
-
2newbrt/tests/cachetable-debug-test.c
-
2newbrt/tests/cachetable-fd-test.c
-
4newbrt/tests/cachetable-flush-test.c
-
2newbrt/tests/cachetable-getandpin-test.c
-
2newbrt/tests/cachetable-put-test.c
-
2newbrt/tests/cachetable-rename-test.c
-
2newbrt/tests/cachetable-scan.c
-
16newbrt/tests/cachetable-test.c
-
4newbrt/tests/cachetable-test2.c
-
2newbrt/tests/cachetable-unpin-test.c
-
2newbrt/tests/keyrange-dupsort-unflat.c
-
2newbrt/tests/keyrange-dupsort.c
-
2newbrt/tests/keyrange-unflat.c
-
2newbrt/tests/keyrange.c
-
2newbrt/tests/shortcut.c
-
2newbrt/tests/test-brt-delete-both.c
-
2newbrt/tests/test-brt-overflow.c
-
2newbrt/tests/test-del-inorder.c
-
2newbrt/tests/test-inc-split.c
-
40src/export.def
-
2src/export.map
-
175src/tests/diskfull.c
-
2src/tokuglobals.py
-
3src/ydb-internal.h
-
83src/ydb.c
-
3toku_include/toku_portability.h
@ -0,0 +1,25 @@ |
|||
#include <unistd.h> |
|||
|
|||
static ssize_t (*t_pwrite)(int, const void *, size_t, off_t) = 0; |
|||
static ssize_t (*t_write)(int, const void *, size_t) = 0; |
|||
|
|||
int toku_set_func_pwrite (ssize_t (*pwrite_fun)(int, const void *, size_t, off_t)) { |
|||
t_pwrite = pwrite_fun; |
|||
return 0; |
|||
} |
|||
|
|||
int toku_set_func_write (ssize_t (*write_fun)(int, const void *, size_t)) { |
|||
t_write = write_fun; |
|||
return 0; |
|||
} |
|||
|
|||
|
|||
ssize_t |
|||
toku_os_pwrite (int fd, const void *buf, size_t len, off_t off) |
|||
{ |
|||
if (t_pwrite) { |
|||
return t_pwrite(fd, buf, len, off); |
|||
} else { |
|||
return pwrite(fd, buf, len, off); |
|||
} |
|||
} |
|||
@ -0,0 +1,175 @@ |
|||
/* -*- mode: C; c-basic-offset: 4 -*- */ |
|||
#ident "Copyright (c) 2007 Tokutek Inc. All rights reserved." |
|||
#include "test.h" |
|||
/* Simulate disk full by making pwrite return ENOSPC */ |
|||
/* Strategy, repeatedly run a test, and on the Ith run of the test make the Ith write fail. */ |
|||
|
|||
#include <fcntl.h> |
|||
#include <errno.h> |
|||
|
|||
#define DOERR(r) do { if (r!=0) { did_fail=1; fprintf(stderr, "%s:%d error %d (%s)\n", __FILE__, __LINE__, r, db_strerror(r)); }} while (0) |
|||
|
|||
static void |
|||
do_db_work(void) { |
|||
int r; |
|||
int did_fail=0; |
|||
{ |
|||
|
|||
system("rm -rf " ENVDIR); |
|||
r=toku_os_mkdir(ENVDIR, S_IRWXU+S_IRWXG+S_IRWXO); assert(r==0); |
|||
|
|||
DB_ENV *env; |
|||
DB_TXN *tid; |
|||
DB *db; |
|||
DBT key,data; |
|||
|
|||
r=db_env_create(&env, 0); assert(r==0); |
|||
env->set_errfile(env, stderr); |
|||
// Don't set the lg bsize for the small experiment. |
|||
r=env->open(env, ENVDIR, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE|DB_THREAD, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); |
|||
r=db_create(&db, env, 0); CKERR(r); |
|||
r=env->txn_begin(env, 0, &tid, 0); assert(r==0); |
|||
r=db->open(db, tid, "foo.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); DOERR(r); |
|||
if (did_fail) { |
|||
r=tid->abort(tid); CKERR(r); |
|||
} else { |
|||
r=tid->commit(tid, 0); DOERR(r); |
|||
} |
|||
if (did_fail) goto shutdown1; |
|||
|
|||
r=env->txn_begin(env, 0, &tid, 0); assert(r==0); |
|||
r=db->put(db, tid, dbt_init(&key, "a", 2), dbt_init(&data, "b", 2), 0); DOERR(r); |
|||
if (did_fail) { |
|||
r = tid->abort(tid); CKERR(r); |
|||
} else { |
|||
r=tid->commit(tid, 0); DOERR(r); |
|||
} |
|||
|
|||
shutdown1: |
|||
r=db->close(db, 0); DOERR(r); |
|||
r=env->close(env, 0); DOERR(r); |
|||
if (did_fail) return; |
|||
} |
|||
{ |
|||
system("rm -rf " ENVDIR); |
|||
r=toku_os_mkdir(ENVDIR, S_IRWXU+S_IRWXG+S_IRWXO); assert(r==0); |
|||
|
|||
DB_ENV *env; |
|||
DB_TXN *tid; |
|||
DB *db; |
|||
DBT key,data; |
|||
|
|||
// Repeat with more put operations |
|||
r=db_env_create(&env, 0); assert(r==0); |
|||
env->set_errfile(env, stderr); |
|||
r=env->set_lg_bsize(env, 4096); assert(r==0); |
|||
r=env->set_cachesize(env, 0, 1, 1); assert(r==0); |
|||
r=env->open(env, ENVDIR, DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_CREATE|DB_PRIVATE|DB_THREAD, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); |
|||
r=db_create(&db, env, 0); CKERR(r); |
|||
r=db->set_pagesize(db, 4096); |
|||
r=env->txn_begin(env, 0, &tid, 0); assert(r==0); |
|||
r=db->open(db, tid, "foo.db", 0, DB_BTREE, DB_CREATE, S_IRWXU+S_IRWXG+S_IRWXO); DOERR(r); |
|||
if (did_fail) { |
|||
r = tid->abort(tid); CKERR(r); |
|||
} else { |
|||
r=tid->commit(tid, 0); DOERR(r); |
|||
} |
|||
if (did_fail) goto shutdown2; |
|||
|
|||
// Put an extra item in so that the rolltmp file will be created. |
|||
r=env->txn_begin(env, 0, &tid, 0); assert(r==0); |
|||
r=db->put(db, tid, dbt_init(&key, "a", 2), dbt_init(&data, "b", 2), 0); DOERR(r); |
|||
if (did_fail) { |
|||
r=tid->abort(tid); CKERR(r); |
|||
} else { |
|||
r=tid->commit(tid, 0); DOERR(r); |
|||
} |
|||
if (did_fail) goto shutdown2; |
|||
|
|||
r=env->txn_begin(env, 0, &tid, 0); assert(r==0); |
|||
{ |
|||
int i; |
|||
for (i=0; i<100; i++) { |
|||
int kvsize=50; |
|||
int kvsize_i = kvsize / sizeof(int); |
|||
int keyi[kvsize_i],vali[kvsize_i]; |
|||
int j; |
|||
keyi[0] = vali[0] = toku_htonl(i); |
|||
for (j=1; j<kvsize_i; j++) { |
|||
keyi[j] = random(); |
|||
vali[j] = random(); |
|||
} |
|||
r=db->put(db, tid, dbt_init(&key, keyi, sizeof keyi), dbt_init(&data, vali, sizeof vali), 0); |
|||
DOERR(r); |
|||
if (did_fail) goto break_out_of_loop; |
|||
} |
|||
} |
|||
break_out_of_loop: |
|||
system("ls -l " ENVDIR); |
|||
if (did_fail) { |
|||
r=tid->abort(tid); CKERR(r); |
|||
} else { |
|||
r=tid->commit(tid, 0); DOERR(r); |
|||
} |
|||
shutdown2: |
|||
r=db->close(db, 0); DOERR(r); |
|||
r=env->close(env, 0); DOERR(r); |
|||
} |
|||
} |
|||
|
|||
static int write_count = 0; |
|||
#define FAIL_NEVER 0x7FFFFFFF |
|||
static int fail_at = FAIL_NEVER; |
|||
|
|||
static ssize_t |
|||
pwrite_counting_and_failing (int fd, const void *buf, size_t size, off_t off) |
|||
{ |
|||
write_count++; |
|||
if (write_count>fail_at) { |
|||
errno = ENOSPC; |
|||
return -1; |
|||
} else { |
|||
return pwrite(fd, buf, size, off); |
|||
} |
|||
} |
|||
|
|||
static ssize_t |
|||
write_counting_and_failing (int fd, const void *buf, size_t size) |
|||
{ |
|||
write_count++; |
|||
if (write_count>fail_at) { |
|||
errno = ENOSPC; |
|||
return -1; |
|||
} else { |
|||
return write(fd, buf, size); |
|||
} |
|||
} |
|||
|
|||
static void |
|||
do_writes_that_fail (void) { |
|||
db_env_set_func_pwrite(pwrite_counting_and_failing); |
|||
db_env_set_func_write (write_counting_and_failing); |
|||
write_count=0; |
|||
do_db_work(); |
|||
printf("Write_count=%d\n", write_count); |
|||
|
|||
int count = write_count; |
|||
|
|||
// fail_at=83; write_count=0; do_db_work(); |
|||
|
|||
for (fail_at = 0; fail_at<count; fail_at++) { |
|||
printf("About to fail at %d:\n", fail_at); |
|||
write_count=0; |
|||
do_db_work(); |
|||
} |
|||
|
|||
// fail_at = FAIL_NEVER; write_count=0; |
|||
// do_db_work(); |
|||
} |
|||
|
|||
int |
|||
test_main (int argc, const char *argv[]) { |
|||
parse_args(argc, argv); |
|||
do_writes_that_fail(); |
|||
return 0; |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue