[SCM] CTDB repository - branch master updated - ctdb-2.1-202-g32723c9

[Michael Adam]

The branch, master has been updated
       via  32723c9efdad1c6ca4aa53f308ccd9bef1aadfff (commit)
      from  b697625b184227dad1be31a41b7a3fd9bd312e29 (commit)

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


- Log -----------------------------------------------------------------
commit 32723c9efdad1c6ca4aa53f308ccd9bef1aadfff
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Fri May 24 18:07:39 2013 +1000

    vacuum: Reduce the priority of non-critical error
    
    Since the complete database is not locked when the receive_records
    control is received, it's possible that we may not be able to obtain
    lock on a chain.  We will try again to store this record.
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Michael Adam <obnox at samba.org>

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

Summary of changes:
 server/ctdb_recover.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/server/ctdb_recover.c b/server/ctdb_recover.c
index 6506f8b..7a8b0bb 100644
--- a/server/ctdb_recover.c
+++ b/server/ctdb_recover.c
@@ -1138,7 +1138,7 @@ static int store_tdb_record(struct ctdb_context *ctdb,
 
 	/* use a non-blocking lock */
 	if (tdb_chainlock_nonblock(ctdb_db->ltdb->tdb, key) != 0) {
-		DEBUG(DEBUG_ERR, (__location__ " Failed to lock chain\n"));
+		DEBUG(DEBUG_INFO, (__location__ " Failed to lock chain in non-blocking mode\n"));
 		return -1;
 	}
 


-- 
CTDB repository