[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Mon Feb 27 04:51:02 MST 2012


The branch, master has been updated
       via  8a0e420 dbwrap: changed log level for information about lock order
       via  dc677b3 selftest: up the default log level in s3
      from  b6fcac6 s3-selftest: avoid running LOCAL- tests twice

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8a0e420d4c5c48f49ec15fb91258f8a569ed1a63
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Feb 9 14:10:41 2012 +1100

    dbwrap: changed log level for information about lock order
    
    we were filling our logs with lock ordering debug lines
    
    Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Mon Feb 27 12:50:29 CET 2012 on sn-devel-104

commit dc677b3baf0585862d4417fc0907f8f5940dbeb4
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Feb 13 17:47:11 2012 +1100

    selftest: up the default log level in s3
    
    This may help show more detail when our tests fail.
    
    Andrew Bartlett

-----------------------------------------------------------------------

Summary of changes:
 selftest/target/Samba3.pm   |    2 +-
 source3/lib/dbwrap/dbwrap.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 2696014..45705c0 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -897,7 +897,7 @@ sub provision($$$$$$$)
 	pid directory = $piddir
 	lock directory = $lockdir
 	log file = $logdir/log.\%m
-	log level = 0
+	log level = 1
 	debug pid = yes
         max log size = 0
 
diff --git a/source3/lib/dbwrap/dbwrap.c b/source3/lib/dbwrap/dbwrap.c
index e443fa5..11ab5d9 100644
--- a/source3/lib/dbwrap/dbwrap.c
+++ b/source3/lib/dbwrap/dbwrap.c
@@ -118,7 +118,7 @@ static struct dbwrap_lock_order_state *dbwrap_check_lock_order(
 
 	used = ffs(lock_order_mask);
 
-	DEBUG(1, ("used=%d, lock_order=%d, idx=%d\n", used,
+	DEBUG(5, ("used=%d, lock_order=%d, idx=%d\n", used,
 		  (int)db->lock_order, (int)idx));
 
 	if ((used != 0) && (used-1 <= idx)) {


-- 
Samba Shared Repository


More information about the samba-cvs mailing list