tdb: fixed the intermittent failure of tdbtorture in the build farm

There was a race condition that caused the torture.tdb to be left in a
state that needed recovery. The torture code thought that any message
from the tdb code was an error, so the "recovered" message, which is a
TDB_DEBUG_TRACE message, marked the run as being an error when it
isn't.

diff --git a/lib/tdb/tools/tdbtorture.c b/lib/tdb/tools/tdbtorture.c
index c754b817f25071d473504d15eeabc4c6841b23f4..bd5fb201b70f130936f2af4faf9ef9c6c5286dfe 100644 (file)
--- a/lib/tdb/tools/tdbtorture.c
+++ b/lib/tdb/tools/tdbtorture.c
@@ -36,8 +36,11 @@ static void tdb_log(struct tdb_context *tdb, enum tdb_debug_level level, const c
 static void tdb_log(struct tdb_context *tdb, enum tdb_debug_level level, const char *format, ...)
 {
        va_list ap;
-    
-       error_count++;
+
+       /* trace level messages do not indicate an error */
+       if (level != TDB_DEBUG_TRACE) {
+               error_count++;
+       }
 
        va_start(ap, format);
        vfprintf(stdout, format, ap);