tdb2: don't cancel transactions on lock failures in tdb1 backend.

[ccan] / ccan / tdb / tools / tdbtorture.c

diff --git a/ccan/tdb/tools/tdbtorture.c b/ccan/tdb/tools/tdbtorture.c
index 58bef81a201ed4aca26448763742ab3a4a0301d1..fc219b8d087ef3c7695848fc597135531a9f3b2d 100644 (file)
--- a/ccan/tdb/tools/tdbtorture.c
+++ b/ccan/tdb/tools/tdbtorture.c
@@ -41,8 +41,8 @@ static int loopnum;
 static int count_pipe;
 static struct tdb_logging_context log_ctx;
 
-#ifdef PRINTF_ATTRIBUTE
-static void tdb_log(struct tdb_context *tdb, enum tdb_debug_level level, const char *format, ...) PRINTF_ATTRIBUTE(3,4);
+#ifdef PRINTF_FMT
+static void tdb_log(struct tdb_context *tdb, enum tdb_debug_level level, const char *format, ...) PRINTF_FMT(3,4);
 #endif
 static void tdb_log(struct tdb_context *tdb, enum tdb_debug_level level, const char *format, ...)
 {
@@ -252,16 +252,12 @@ static void send_count_and_suicide(int sig)
 
 static int run_child(int i, int seed, unsigned num_loops, unsigned start)
 {
-       db = tdb_open_ex("torture.tdb", hash_size, TDB_CLEAR_IF_FIRST, 
+       db = tdb_open_ex("torture.tdb", hash_size, TDB_DEFAULT, 
                         O_RDWR | O_CREAT, 0600, &log_ctx, NULL);
        if (!db) {
                fatal("db open failed");
        }
 
-       if (seed == -1) {
-               seed = (getpid() + time(NULL)) & 0x7FFFFFFF;
-       }
-
        srand(seed + i);
        srandom(seed + i);
 
@@ -336,6 +332,10 @@ int main(int argc, char * const *argv)
 
        unlink("torture.tdb");
 
+       if (seed == -1) {
+               seed = (getpid() + time(NULL)) & 0x7FFFFFFF;
+       }
+
        if (num_procs == 1 && !kill_random) {
                /* Don't fork for this case, makes debugging easier. */
                error_count = run_child(0, seed, num_loops, 0);