[SCM] CTDB repository - branch master updated - ctdb-1.0.114-142-gb977901
Ronnie Sahlberg
sahlberg at samba.org
Mon Jun 7 20:22:20 MDT 2010
The branch, master has been updated
via b977901a49a9fed45cc8a2fe880eb749f58278f6 (commit)
from f62c7e44dc303f274bbc1dd59fad2167e72a2af0 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b977901a49a9fed45cc8a2fe880eb749f58278f6
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Tue Jun 8 12:09:19 2010 +1000
Additional log messages when tdb databases can no longer be chainlocked or chainunlocked
BZ64688
-----------------------------------------------------------------------
Summary of changes:
common/ctdb_ltdb.c | 2 +-
server/ctdb_freeze.c | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/common/ctdb_ltdb.c b/common/ctdb_ltdb.c
index b2fd189..d35b690 100644
--- a/common/ctdb_ltdb.c
+++ b/common/ctdb_ltdb.c
@@ -191,7 +191,7 @@ int ctdb_ltdb_unlock(struct ctdb_db_context *ctdb_db, TDB_DATA key)
{
int ret = tdb_chainunlock(ctdb_db->ltdb->tdb, key);
if (ret != 0) {
- DEBUG(DEBUG_ERR,("tdb_chainunlock failed\n"));
+ DEBUG(DEBUG_ERR,(__location__ " tdb_chainunlock failed on database %s\n", ctdb_db->db_name));
}
return ret;
}
diff --git a/server/ctdb_freeze.c b/server/ctdb_freeze.c
index 3852008..70333b0 100644
--- a/server/ctdb_freeze.c
+++ b/server/ctdb_freeze.c
@@ -48,6 +48,7 @@ static int ctdb_lock_all_databases(struct ctdb_context *ctdb, uint32_t priority)
}
DEBUG(DEBUG_INFO,("locking database 0x%08x priority:%u %s\n", ctdb_db->db_id, ctdb_db->priority, ctdb_db->db_name));
if (tdb_lockall(ctdb_db->ltdb->tdb) != 0) {
+ DEBUG(DEBUG_ERR,(__location__ " Failed to lock database %s\n", ctdb_db->db_name));
return -1;
}
}
@@ -60,6 +61,7 @@ static int ctdb_lock_all_databases(struct ctdb_context *ctdb, uint32_t priority)
}
DEBUG(DEBUG_INFO,("locking database 0x%08x priority:%u %s\n", ctdb_db->db_id, ctdb_db->priority, ctdb_db->db_name));
if (tdb_lockall(ctdb_db->ltdb->tdb) != 0) {
+ DEBUG(DEBUG_ERR,(__location__ " Failed to lock database %s\n", ctdb_db->db_name));
return -1;
}
}
--
CTDB repository
More information about the samba-cvs
mailing list