X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb1_transaction.c;h=9c526fb41e5d194fa10dcf2d910022881a3fc3ae;hp=3358e57a00e27ff993e4cac9f8355550663fe0bf;hb=a391b2b900bc6d5c0467869a454bdb5c51b5a3be;hpb=b929638e3cfe629285af3ecd0813e03eaeaa1133

diff --git a/ccan/tdb2/tdb1_transaction.c b/ccan/tdb2/tdb1_transaction.c
index 3358e57a..9c526fb4 100644
--- a/ccan/tdb2/tdb1_transaction.c
+++ b/ccan/tdb2/tdb1_transaction.c
@@ -81,25 +81,16 @@
     usual. This allows for smooth crash recovery with no administrator
     intervention.
 
-  - if TDB1_NOSYNC is passed to flags in tdb1_open then transactions are
+  - if TDB_NOSYNC is passed to flags in tdb1_open then transactions are
     still available, but no transaction recovery area is used and no
     fsync/msync calls are made.
 
-  - if TDB1_ALLOW_NESTING is passed to flags in tdb open, or added using
+  - if TDB_ALLOW_NESTING is passed to flags in tdb open, or added using
     tdb1_add_flags() transaction nesting is enabled.
-    It resets the TDB1_DISALLOW_NESTING flag, as both cannot be used together.
-    The default is that transaction nesting is allowed.
-    Note: this default may change in future versions of tdb.
+    The default is that transaction nesting is NOT allowed.
 
     Beware. when transactions are nested a transaction successfully
     completed with tdb1_transaction_commit() can be silently unrolled later.
-
-  - if TDB1_DISALLOW_NESTING is passed to flags in tdb open, or added using
-    tdb1_add_flags() transaction nesting is disabled.
-    It resets the TDB1_ALLOW_NESTING flag, as both cannot be used together.
-    An attempt create a nested transaction will fail with TDB1_ERR_NESTING.
-    The default is that transaction nesting is allowed.
-    Note: this default may change in future versions of tdb.
 */
 
 
@@ -194,8 +185,9 @@ static int transaction1_read(struct tdb1_context *tdb, tdb1_off_t off, void *buf
 	return 0;
 
 fail:
-	TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "transaction_read: failed at off=%d len=%d\n", off, len));
-	tdb->ecode = TDB1_ERR_IO;
+	tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+				"transaction_read: failed at off=%d len=%d",
+				off, len);
 	tdb->transaction->transaction_error = 1;
 	return -1;
 }
@@ -211,8 +203,9 @@ static int transaction1_write(struct tdb1_context *tdb, tdb1_off_t off,
 
 	/* Only a commit is allowed on a prepared transaction */
 	if (tdb->transaction->prepared) {
-		tdb->ecode = TDB1_ERR_EINVAL;
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "transaction_write: transaction already prepared, write not allowed\n"));
+		tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
+					"transaction_write: transaction already"
+					" prepared, write not allowed");
 		tdb->transaction->transaction_error = 1;
 		return -1;
 	}
@@ -257,7 +250,7 @@ static int transaction1_write(struct tdb1_context *tdb, tdb1_off_t off,
 				(blk+1)*sizeof(uint8_t *));
 		}
 		if (new_blocks == NULL) {
-			tdb->ecode = TDB1_ERR_OOM;
+			tdb->last_error = TDB_ERR_OOM;
 			goto fail;
 		}
 		memset(&new_blocks[tdb->transaction->num_blocks], 0,
@@ -271,7 +264,7 @@ static int transaction1_write(struct tdb1_context *tdb, tdb1_off_t off,
 	if (tdb->transaction->blocks[blk] == NULL) {
 		tdb->transaction->blocks[blk] = (uint8_t *)calloc(tdb->transaction->block_size, 1);
 		if (tdb->transaction->blocks[blk] == NULL) {
-			tdb->ecode = TDB1_ERR_OOM;
+			tdb->last_error = TDB_ERR_OOM;
 			tdb->transaction->transaction_error = 1;
 			return -1;
 		}
@@ -284,7 +277,7 @@ static int transaction1_write(struct tdb1_context *tdb, tdb1_off_t off,
 								   tdb->transaction->blocks[blk],
 								   len2, 0) != 0) {
 				SAFE_FREE(tdb->transaction->blocks[blk]);
-				tdb->ecode = TDB1_ERR_IO;
+				tdb->last_error = TDB_ERR_IO;
 				goto fail;
 			}
 			if (blk == tdb->transaction->num_blocks-1) {
@@ -308,8 +301,9 @@ static int transaction1_write(struct tdb1_context *tdb, tdb1_off_t off,
 	return 0;
 
 fail:
-	TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "transaction_write: failed at off=%d len=%d\n",
-		 (blk*tdb->transaction->block_size) + off, len));
+	tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+		   "transaction_write: failed at off=%d len=%d",
+		   (blk*tdb->transaction->block_size) + off, len);
 	tdb->transaction->transaction_error = 1;
 	return -1;
 }
@@ -384,10 +378,10 @@ static void transaction1_next_hash_chain(struct tdb1_context *tdb, uint32_t *cha
 */
 static int transaction1_oob(struct tdb1_context *tdb, tdb1_off_t len, int probe)
 {
-	if (len <= tdb->map_size) {
+	if (len <= tdb->file->map_size) {
 		return 0;
 	}
-	tdb->ecode = TDB1_ERR_IO;
+	tdb->last_error = TDB_ERR_IO;
 	return -1;
 }
 
@@ -421,25 +415,24 @@ static const struct tdb1_methods transaction1_methods = {
   start a tdb transaction. No token is returned, as only a single
   transaction is allowed to be pending per tdb1_context
 */
-static int _tdb1_transaction_start(struct tdb1_context *tdb,
-				  enum tdb1_lock_flags lockflags)
+static int _tdb1_transaction_start(struct tdb1_context *tdb)
 {
 	/* some sanity checks */
-	if (tdb->read_only || (tdb->flags & TDB1_INTERNAL) || tdb->traverse_read) {
-		TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_transaction_start: cannot start a transaction on a read-only or internal db\n"));
-		tdb->ecode = TDB1_ERR_EINVAL;
+	if (tdb->read_only || (tdb->flags & TDB_INTERNAL) || tdb->traverse_read) {
+		tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
+					"tdb1_transaction_start: cannot start a"
+					" transaction on a read-only or"
+					" internal db");
 		return -1;
 	}
 
 	/* cope with nested tdb1_transaction_start() calls */
 	if (tdb->transaction != NULL) {
-		if (!(tdb->flags & TDB1_ALLOW_NESTING)) {
-			tdb->ecode = TDB1_ERR_NESTING;
+		if (!(tdb->flags & TDB_ALLOW_NESTING)) {
+			tdb->last_error = TDB_ERR_EINVAL;
 			return -1;
 		}
 		tdb->transaction->nesting++;
-		TDB1_LOG((tdb, TDB1_DEBUG_TRACE, "tdb1_transaction_start: nesting %d\n",
-			 tdb->transaction->nesting));
 		return 0;
 	}
 
@@ -447,8 +440,9 @@ static int _tdb1_transaction_start(struct tdb1_context *tdb,
 		/* the caller must not have any locks when starting a
 		   transaction as otherwise we'll be screwed by lack
 		   of nested locks in posix */
-		TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_transaction_start: cannot start a transaction with locks held\n"));
-		tdb->ecode = TDB1_ERR_LOCK;
+		tdb->last_error = tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_USE_ERROR,
+					"tdb1_transaction_start: cannot start a"
+					" transaction with locks held");
 		return -1;
 	}
 
@@ -456,15 +450,16 @@ static int _tdb1_transaction_start(struct tdb1_context *tdb,
 		/* you cannot use transactions inside a traverse (although you can use
 		   traverse inside a transaction) as otherwise you can end up with
 		   deadlock */
-		TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_transaction_start: cannot start a transaction within a traverse\n"));
-		tdb->ecode = TDB1_ERR_LOCK;
+		tdb->last_error = tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_USE_ERROR,
+					"tdb1_transaction_start: cannot start a"
+					" transaction within a traverse");
 		return -1;
 	}
 
 	tdb->transaction = (struct tdb1_transaction *)
 		calloc(sizeof(struct tdb1_transaction), 1);
 	if (tdb->transaction == NULL) {
-		tdb->ecode = TDB1_ERR_OOM;
+		tdb->last_error = TDB_ERR_OOM;
 		return -1;
 	}
 
@@ -474,19 +469,20 @@ static int _tdb1_transaction_start(struct tdb1_context *tdb,
 	/* get the transaction write lock. This is a blocking lock. As
 	   discussed with Volker, there are a number of ways we could
 	   make this async, which we will probably do in the future */
-	if (tdb1_transaction_lock(tdb, F_WRLCK, lockflags) == -1) {
+	if (tdb1_transaction_lock(tdb, F_WRLCK, TDB_LOCK_WAIT) == -1) {
 		SAFE_FREE(tdb->transaction->blocks);
 		SAFE_FREE(tdb->transaction);
-		if ((lockflags & TDB1_LOCK_WAIT) == 0) {
-			tdb->ecode = TDB1_ERR_NOLOCK;
-		}
 		return -1;
 	}
 
 	/* get a read lock from the freelist to the end of file. This
 	   is upgraded to a write lock during the commit */
-	if (tdb1_allrecord_lock(tdb, F_RDLCK, TDB1_LOCK_WAIT, true) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_transaction_start: failed to get hash locks\n"));
+	if (tdb1_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, true) == -1) {
+		if (errno != EAGAIN && errno != EINTR) {
+			tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+				   "tdb1_transaction_start:"
+				   " failed to get hash locks");
+		}
 		goto fail_allrecord_lock;
 	}
 
@@ -495,20 +491,20 @@ static int _tdb1_transaction_start(struct tdb1_context *tdb,
 	tdb->transaction->hash_heads = (uint32_t *)
 		calloc(tdb->header.hash_size+1, sizeof(uint32_t));
 	if (tdb->transaction->hash_heads == NULL) {
-		tdb->ecode = TDB1_ERR_OOM;
+		tdb->last_error = TDB_ERR_OOM;
 		goto fail;
 	}
 	if (tdb->methods->tdb1_read(tdb, TDB1_FREELIST_TOP, tdb->transaction->hash_heads,
 				   TDB1_HASHTABLE_SIZE(tdb), 0) != 0) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_start: failed to read hash heads\n"));
-		tdb->ecode = TDB1_ERR_IO;
+		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+			   "tdb1_transaction_start: failed to read hash heads");
 		goto fail;
 	}
 
 	/* make sure we know about any file expansions already done by
 	   anyone else */
-	tdb->methods->tdb1_oob(tdb, tdb->map_size + 1, 1);
-	tdb->transaction->old_map_size = tdb->map_size;
+	tdb->methods->tdb1_oob(tdb, tdb->file->map_size + 1, 1);
+	tdb->transaction->old_map_size = tdb->file->map_size;
 
 	/* finally hook the io methods, replacing them with
 	   transaction specific methods */
@@ -518,7 +514,7 @@ static int _tdb1_transaction_start(struct tdb1_context *tdb,
 	return 0;
 
 fail:
-	tdb1_allrecord_unlock(tdb, F_RDLCK, false);
+	tdb1_allrecord_unlock(tdb, F_RDLCK);
 fail_allrecord_lock:
 	tdb1_transaction_unlock(tdb, F_WRLCK);
 	SAFE_FREE(tdb->transaction->blocks);
@@ -527,9 +523,9 @@ fail_allrecord_lock:
 	return -1;
 }
 
-_PUBLIC_ int tdb1_transaction_start(struct tdb1_context *tdb)
+int tdb1_transaction_start(struct tdb1_context *tdb)
 {
-	return _tdb1_transaction_start(tdb, TDB1_LOCK_WAIT);
+	return _tdb1_transaction_start(tdb);
 }
 
 /*
@@ -537,27 +533,28 @@ _PUBLIC_ int tdb1_transaction_start(struct tdb1_context *tdb)
 */
 static int transaction1_sync(struct tdb1_context *tdb, tdb1_off_t offset, tdb1_len_t length)
 {
-	if (tdb->flags & TDB1_NOSYNC) {
+	if (tdb->flags & TDB_NOSYNC) {
 		return 0;
 	}
 
 #if HAVE_FDATASYNC
-	if (fdatasync(tdb->fd) != 0) {
+	if (fdatasync(tdb->file->fd) != 0) {
 #else
-	if (fsync(tdb->fd) != 0) {
+	if (fsync(tdb->file->fd) != 0) {
 #endif
-		tdb->ecode = TDB1_ERR_IO;
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction: fsync failed\n"));
+		tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+					"tdb1_transaction: fsync failed");
 		return -1;
 	}
 #if HAVE_MMAP
-	if (tdb->map_ptr) {
+	if (tdb->file->map_ptr) {
 		tdb1_off_t moffset = offset & ~(tdb->page_size-1);
-		if (msync(moffset + (char *)tdb->map_ptr,
+		if (msync(moffset + (char *)tdb->file->map_ptr,
 			  length + (offset - moffset), MS_SYNC) != 0) {
-			tdb->ecode = TDB1_ERR_IO;
-			TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction: msync failed - %s\n",
-				 strerror(errno)));
+			tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+						"tdb1_transaction:"
+						" msync failed - %s",
+						strerror(errno));
 			return -1;
 		}
 	}
@@ -571,7 +568,9 @@ static int _tdb1_transaction_cancel(struct tdb1_context *tdb)
 	int i, ret = 0;
 
 	if (tdb->transaction == NULL) {
-		TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_transaction_cancel: no transaction\n"));
+		tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
+					"tdb1_transaction_cancel:"
+					" no transaction");
 		return -1;
 	}
 
@@ -581,7 +580,7 @@ static int _tdb1_transaction_cancel(struct tdb1_context *tdb)
 		return 0;
 	}
 
-	tdb->map_size = tdb->transaction->old_map_size;
+	tdb->file->map_size = tdb->transaction->old_map_size;
 
 	/* free all the transaction blocks */
 	for (i=0;i<tdb->transaction->num_blocks;i++) {
@@ -598,7 +597,9 @@ static int _tdb1_transaction_cancel(struct tdb1_context *tdb)
 		/* remove the recovery marker */
 		if (methods->tdb1_write(tdb, tdb->transaction->magic_offset, &invalid, 4) == -1 ||
 		transaction1_sync(tdb, tdb->transaction->magic_offset, 4) == -1) {
-			TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_cancel: failed to remove recovery magic\n"));
+			tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+				   "tdb1_transaction_cancel: failed to"
+				   " remove recovery magic");
 			ret = -1;
 		}
 	}
@@ -618,7 +619,7 @@ static int _tdb1_transaction_cancel(struct tdb1_context *tdb)
 /*
   cancel the current transaction
 */
-_PUBLIC_ int tdb1_transaction_cancel(struct tdb1_context *tdb)
+int tdb1_transaction_cancel(struct tdb1_context *tdb)
 {
 	return _tdb1_transaction_cancel(tdb);
 }
@@ -692,7 +693,9 @@ static int tdb1_recovery_allocate(struct tdb1_context *tdb,
 	tdb1_off_t recovery_head;
 
 	if (tdb1_recovery_area(tdb, methods, &recovery_head, &rec) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_recovery_allocate: failed to read recovery head\n"));
+		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+			   "tdb1_recovery_allocate:"
+			   " failed to read recovery head");
 		return -1;
 	}
 
@@ -712,7 +715,9 @@ static int tdb1_recovery_allocate(struct tdb1_context *tdb,
 	   the transaction) */
 	if (recovery_head != 0) {
 		if (tdb1_free(tdb, recovery_head, &rec) == -1) {
-			TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_recovery_allocate: failed to free previous recovery area\n"));
+			tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+				   "tdb1_recovery_allocate: failed to free"
+				   " previous recovery area");
 			return -1;
 		}
 	}
@@ -722,33 +727,39 @@ static int tdb1_recovery_allocate(struct tdb1_context *tdb,
 
 	/* round up to a multiple of page size */
 	*recovery_max_size = TDB1_ALIGN(sizeof(rec) + *recovery_size, tdb->page_size) - sizeof(rec);
-	*recovery_offset = tdb->map_size;
+	*recovery_offset = tdb->file->map_size;
 	recovery_head = *recovery_offset;
 
 	if (methods->tdb1_expand_file(tdb, tdb->transaction->old_map_size,
-				     (tdb->map_size - tdb->transaction->old_map_size) +
+				     (tdb->file->map_size - tdb->transaction->old_map_size) +
 				     sizeof(rec) + *recovery_max_size) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_recovery_allocate: failed to create recovery area\n"));
+		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+			   "tdb1_recovery_allocate:"
+			   " failed to create recovery area");
 		return -1;
 	}
 
 	/* remap the file (if using mmap) */
-	methods->tdb1_oob(tdb, tdb->map_size + 1, 1);
+	methods->tdb1_oob(tdb, tdb->file->map_size + 1, 1);
 
 	/* we have to reset the old map size so that we don't try to expand the file
 	   again in the transaction commit, which would destroy the recovery area */
-	tdb->transaction->old_map_size = tdb->map_size;
+	tdb->transaction->old_map_size = tdb->file->map_size;
 
 	/* write the recovery header offset and sync - we can sync without a race here
 	   as the magic ptr in the recovery record has not been set */
 	TDB1_CONV(recovery_head);
 	if (methods->tdb1_write(tdb, TDB1_RECOVERY_HEAD,
 			       &recovery_head, sizeof(tdb1_off_t)) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_recovery_allocate: failed to write recovery head\n"));
+		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+			   "tdb1_recovery_allocate:"
+			   " failed to write recovery head");
 		return -1;
 	}
 	if (transaction1_write_existing(tdb, TDB1_RECOVERY_HEAD, &recovery_head, sizeof(tdb1_off_t)) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_recovery_allocate: failed to write recovery head\n"));
+		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+			   "tdb1_recovery_allocate:"
+			   " failed to write recovery head");
 		return -1;
 	}
 
@@ -781,7 +792,7 @@ static int transaction1_setup_recovery(struct tdb1_context *tdb,
 
 	data = (unsigned char *)malloc(recovery_size + sizeof(*rec));
 	if (data == NULL) {
-		tdb->ecode = TDB1_ERR_OOM;
+		tdb->last_error = TDB_ERR_OOM;
 		return -1;
 	}
 
@@ -815,9 +826,10 @@ static int transaction1_setup_recovery(struct tdb1_context *tdb,
 			continue;
 		}
 		if (offset + length > tdb->transaction->old_map_size) {
-			TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_setup_recovery: transaction data over new region boundary\n"));
+			tdb->last_error = tdb_logerr(tdb, TDB_ERR_CORRUPT,
+						TDB_LOG_ERROR,
+						"tdb1_transaction_setup_recovery: transaction data over new region boundary");
 			free(data);
-			tdb->ecode = TDB1_ERR_CORRUPT;
 			return -1;
 		}
 		memcpy(p, &offset, 4);
@@ -830,7 +842,7 @@ static int transaction1_setup_recovery(struct tdb1_context *tdb,
 		   method to get it */
 		if (methods->tdb1_read(tdb, offset, p + 8, length, 0) != 0) {
 			free(data);
-			tdb->ecode = TDB1_ERR_IO;
+			tdb->last_error = TDB_ERR_IO;
 			return -1;
 		}
 		p += 8 + length;
@@ -845,15 +857,17 @@ static int transaction1_setup_recovery(struct tdb1_context *tdb,
 
 	/* write the recovery data to the recovery area */
 	if (methods->tdb1_write(tdb, recovery_offset, data, sizeof(*rec) + recovery_size) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_setup_recovery: failed to write recovery data\n"));
+		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+			   "tdb1_transaction_setup_recovery:"
+			   " failed to write recovery data");
 		free(data);
-		tdb->ecode = TDB1_ERR_IO;
 		return -1;
 	}
 	if (transaction1_write_existing(tdb, recovery_offset, data, sizeof(*rec) + recovery_size) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_setup_recovery: failed to write secondary recovery data\n"));
+		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+			   "tdb1_transaction_setup_recovery: failed to write"
+			   " secondary recovery data");
 		free(data);
-		tdb->ecode = TDB1_ERR_IO;
 		return -1;
 	}
 
@@ -873,13 +887,15 @@ static int transaction1_setup_recovery(struct tdb1_context *tdb,
 	*magic_offset = recovery_offset + offsetof(struct tdb1_record, magic);
 
 	if (methods->tdb1_write(tdb, *magic_offset, &magic, sizeof(magic)) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_setup_recovery: failed to write recovery magic\n"));
-		tdb->ecode = TDB1_ERR_IO;
+		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+			   "tdb1_transaction_setup_recovery:"
+			   " failed to write recovery magic");
 		return -1;
 	}
 	if (transaction1_write_existing(tdb, *magic_offset, &magic, sizeof(magic)) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_setup_recovery: failed to write secondary recovery magic\n"));
-		tdb->ecode = TDB1_ERR_IO;
+		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+			   "tdb1_transaction_setup_recovery:"
+			   " failed to write secondary recovery magic");
 		return -1;
 	}
 
@@ -896,21 +912,25 @@ static int _tdb1_transaction_prepare_commit(struct tdb1_context *tdb)
 	const struct tdb1_methods *methods;
 
 	if (tdb->transaction == NULL) {
-		TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_transaction_prepare_commit: no transaction\n"));
+		tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
+					"tdb1_transaction_prepare_commit:"
+					" no transaction");
 		return -1;
 	}
 
 	if (tdb->transaction->prepared) {
-		tdb->ecode = TDB1_ERR_EINVAL;
+		tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
+					"tdb1_transaction_prepare_commit:"
+					" transaction already prepared");
 		_tdb1_transaction_cancel(tdb);
-		TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_transaction_prepare_commit: transaction already prepared\n"));
 		return -1;
 	}
 
 	if (tdb->transaction->transaction_error) {
-		tdb->ecode = TDB1_ERR_IO;
+		tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+					"tdb1_transaction_prepare_commit:"
+					" transaction error pending");
 		_tdb1_transaction_cancel(tdb);
-		TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_transaction_prepare_commit: transaction error pending\n"));
 		return -1;
 	}
 
@@ -929,31 +949,42 @@ static int _tdb1_transaction_prepare_commit(struct tdb1_context *tdb)
 	/* if there are any locks pending then the caller has not
 	   nested their locks properly, so fail the transaction */
 	if (tdb1_have_extra_locks(tdb)) {
-		tdb->ecode = TDB1_ERR_LOCK;
-		TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_transaction_prepare_commit: locks pending on commit\n"));
+		tdb->last_error = tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_USE_ERROR,
+					"tdb1_transaction_prepare_commit:"
+					" locks pending on commit");
 		_tdb1_transaction_cancel(tdb);
 		return -1;
 	}
 
 	/* upgrade the main transaction lock region to a write lock */
 	if (tdb1_allrecord_upgrade(tdb) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_transaction_prepare_commit: failed to upgrade hash locks\n"));
+		if (errno != EAGAIN && errno != EINTR) {
+			tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+				   "tdb1_transaction_prepare_commit:"
+				   " failed to upgrade hash locks");
+		}
 		_tdb1_transaction_cancel(tdb);
 		return -1;
 	}
 
 	/* get the open lock - this prevents new users attaching to the database
 	   during the commit */
-	if (tdb1_nest_lock(tdb, TDB1_OPEN_LOCK, F_WRLCK, TDB1_LOCK_WAIT) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_transaction_prepare_commit: failed to get open lock\n"));
+	if (tdb1_nest_lock(tdb, TDB1_OPEN_LOCK, F_WRLCK, TDB_LOCK_WAIT) == -1) {
+		if (errno != EAGAIN && errno != EINTR) {
+			tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+				   "tdb1_transaction_prepare_commit:"
+				   " failed to get open lock");
+		}
 		_tdb1_transaction_cancel(tdb);
 		return -1;
 	}
 
-	if (!(tdb->flags & TDB1_NOSYNC)) {
+	if (!(tdb->flags & TDB_NOSYNC)) {
 		/* write the recovery data to the end of the file */
 		if (transaction1_setup_recovery(tdb, &tdb->transaction->magic_offset) == -1) {
-			TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_prepare_commit: failed to setup recovery data\n"));
+			tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+				   "tdb1_transaction_prepare_commit:"
+				   " failed to setup recovery data");
 			_tdb1_transaction_cancel(tdb);
 			return -1;
 		}
@@ -962,17 +993,18 @@ static int _tdb1_transaction_prepare_commit(struct tdb1_context *tdb)
 	tdb->transaction->prepared = true;
 
 	/* expand the file to the new size if needed */
-	if (tdb->map_size != tdb->transaction->old_map_size) {
+	if (tdb->file->map_size != tdb->transaction->old_map_size) {
 		if (methods->tdb1_expand_file(tdb, tdb->transaction->old_map_size,
-					     tdb->map_size -
+					     tdb->file->map_size -
 					     tdb->transaction->old_map_size) == -1) {
-			tdb->ecode = TDB1_ERR_IO;
-			TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_prepare_commit: expansion failed\n"));
+			tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+				   "tdb1_transaction_prepare_commit:"
+				   " expansion failed");
 			_tdb1_transaction_cancel(tdb);
 			return -1;
 		}
-		tdb->map_size = tdb->transaction->old_map_size;
-		methods->tdb1_oob(tdb, tdb->map_size + 1, 1);
+		tdb->file->map_size = tdb->transaction->old_map_size;
+		methods->tdb1_oob(tdb, tdb->file->map_size + 1, 1);
 	}
 
 	/* Keep the open lock until the actual commit */
@@ -983,7 +1015,7 @@ static int _tdb1_transaction_prepare_commit(struct tdb1_context *tdb)
 /*
    prepare to commit the current transaction
 */
-_PUBLIC_ int tdb1_transaction_prepare_commit(struct tdb1_context *tdb)
+int tdb1_transaction_prepare_commit(struct tdb1_context *tdb)
 {
 	return _tdb1_transaction_prepare_commit(tdb);
 }
@@ -1013,21 +1045,24 @@ static bool repack_worthwhile(struct tdb1_context *tdb)
 /*
   commit the current transaction
 */
-_PUBLIC_ int tdb1_transaction_commit(struct tdb1_context *tdb)
+int tdb1_transaction_commit(struct tdb1_context *tdb)
 {
 	const struct tdb1_methods *methods;
 	int i;
 	bool need_repack = false;
 
 	if (tdb->transaction == NULL) {
-		TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_transaction_commit: no transaction\n"));
+		tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
+					"tdb1_transaction_commit:"
+					" no transaction");
 		return -1;
 	}
 
 	if (tdb->transaction->transaction_error) {
-		tdb->ecode = TDB1_ERR_IO;
+		tdb->last_error = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+					"tdb1_transaction_commit:"
+					" transaction error pending");
 		_tdb1_transaction_cancel(tdb);
-		TDB1_LOG((tdb, TDB1_DEBUG_ERROR, "tdb1_transaction_commit: transaction error pending\n"));
 		return -1;
 	}
 
@@ -1067,7 +1102,9 @@ _PUBLIC_ int tdb1_transaction_commit(struct tdb1_context *tdb)
 		}
 
 		if (methods->tdb1_write(tdb, offset, tdb->transaction->blocks[i], length) == -1) {
-			TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_commit: write failed during commit\n"));
+			tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+				   "tdb1_transaction_commit:"
+				   " write failed during commit");
 
 			/* we've overwritten part of the data and
 			   possibly expanded the file, so we need to
@@ -1077,7 +1114,8 @@ _PUBLIC_ int tdb1_transaction_commit(struct tdb1_context *tdb)
 
 			_tdb1_transaction_cancel(tdb);
 
-			TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_commit: write failed\n"));
+			tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+				   "tdb1_transaction_commit: write failed");
 			return -1;
 		}
 		SAFE_FREE(tdb->transaction->blocks[i]);
@@ -1092,7 +1130,7 @@ _PUBLIC_ int tdb1_transaction_commit(struct tdb1_context *tdb)
 	tdb->transaction->num_blocks = 0;
 
 	/* ensure the new data is on disk */
-	if (transaction1_sync(tdb, 0, tdb->map_size) == -1) {
+	if (transaction1_sync(tdb, 0, tdb->file->map_size) == -1) {
 		return -1;
 	}
 
@@ -1137,8 +1175,9 @@ int tdb1_transaction_recover(struct tdb1_context *tdb)
 
 	/* find the recovery area */
 	if (tdb1_ofs_read(tdb, TDB1_RECOVERY_HEAD, &recovery_head) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_recover: failed to read recovery head\n"));
-		tdb->ecode = TDB1_ERR_IO;
+		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+			   "tdb1_transaction_recover:"
+			   " failed to read recovery head");
 		return -1;
 	}
 
@@ -1150,8 +1189,9 @@ int tdb1_transaction_recover(struct tdb1_context *tdb)
 	/* read the recovery record */
 	if (tdb->methods->tdb1_read(tdb, recovery_head, &rec,
 				   sizeof(rec), TDB1_DOCONV()) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_recover: failed to read recovery record\n"));
-		tdb->ecode = TDB1_ERR_IO;
+		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+			   "tdb1_transaction_recover:"
+			   " failed to read recovery record");
 		return -1;
 	}
 
@@ -1161,8 +1201,10 @@ int tdb1_transaction_recover(struct tdb1_context *tdb)
 	}
 
 	if (tdb->read_only) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_recover: attempt to recover read only database\n"));
-		tdb->ecode = TDB1_ERR_CORRUPT;
+		tdb->last_error = tdb_logerr(tdb, TDB_ERR_CORRUPT, TDB_LOG_ERROR,
+					"tdb1_transaction_recover:"
+					" attempt to recover read only"
+					" database");
 		return -1;
 	}
 
@@ -1170,16 +1212,18 @@ int tdb1_transaction_recover(struct tdb1_context *tdb)
 
 	data = (unsigned char *)malloc(rec.data_len);
 	if (data == NULL) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_recover: failed to allocate recovery data\n"));
-		tdb->ecode = TDB1_ERR_OOM;
+		tdb->last_error = tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
+					"tdb1_transaction_recover:"
+					" failed to allocate recovery data");
 		return -1;
 	}
 
 	/* read the full recovery data */
 	if (tdb->methods->tdb1_read(tdb, recovery_head + sizeof(rec), data,
 				   rec.data_len, 0) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_recover: failed to read recovery data\n"));
-		tdb->ecode = TDB1_ERR_IO;
+		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+			   "tdb1_transaction_recover:"
+			   " failed to read recovery data");
 		return -1;
 	}
 
@@ -1195,8 +1239,9 @@ int tdb1_transaction_recover(struct tdb1_context *tdb)
 
 		if (tdb->methods->tdb1_write(tdb, ofs, p+8, len) == -1) {
 			free(data);
-			TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_recover: failed to recover %d bytes at offset %d\n", len, ofs));
-			tdb->ecode = TDB1_ERR_IO;
+			tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+				   "tdb1_transaction_recover: failed to recover"
+				   " %d bytes at offset %d", len, ofs);
 			return -1;
 		}
 		p += 8 + len;
@@ -1204,17 +1249,18 @@ int tdb1_transaction_recover(struct tdb1_context *tdb)
 
 	free(data);
 
-	if (transaction1_sync(tdb, 0, tdb->map_size) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_recover: failed to sync recovery\n"));
-		tdb->ecode = TDB1_ERR_IO;
+	if (transaction1_sync(tdb, 0, tdb->file->map_size) == -1) {
+		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+			   "tdb1_transaction_recover: failed to sync recovery");
 		return -1;
 	}
 
 	/* if the recovery area is after the recovered eof then remove it */
 	if (recovery_eof <= recovery_head) {
 		if (tdb1_ofs_write(tdb, TDB1_RECOVERY_HEAD, &zero) == -1) {
-			TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_recover: failed to remove recovery head\n"));
-			tdb->ecode = TDB1_ERR_IO;
+			tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+				   "tdb1_transaction_recover: failed to remove"
+				   " recovery head");
 			return -1;
 		}
 	}
@@ -1222,19 +1268,22 @@ int tdb1_transaction_recover(struct tdb1_context *tdb)
 	/* remove the recovery magic */
 	if (tdb1_ofs_write(tdb, recovery_head + offsetof(struct tdb1_record, magic),
 			  &zero) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_recover: failed to remove recovery magic\n"));
-		tdb->ecode = TDB1_ERR_IO;
+		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+			   "tdb1_transaction_recover: failed to remove"
+			   " recovery magic");
 		return -1;
 	}
 
 	if (transaction1_sync(tdb, 0, recovery_eof) == -1) {
-		TDB1_LOG((tdb, TDB1_DEBUG_FATAL, "tdb1_transaction_recover: failed to sync2 recovery\n"));
-		tdb->ecode = TDB1_ERR_IO;
+		tdb_logerr(tdb, tdb->last_error, TDB_LOG_ERROR,
+			   "tdb1_transaction_recover:"
+			   " failed to sync2 recovery");
 		return -1;
 	}
 
-	TDB1_LOG((tdb, TDB1_DEBUG_TRACE, "tdb1_transaction_recover: recovered %d byte database\n",
-		 recovery_eof));
+	tdb_logerr(tdb, TDB_SUCCESS, TDB_LOG_WARNING,
+		   "tdb1_transaction_recover: recovered %d byte database",
+		   recovery_eof);
 
 	/* all done */
 	return 0;