[SCM] CTDB repository - branch master updated - ctdb-1.0.114-2-g7872743

[Ronnie Sahlberg]

The branch, master has been updated
       via  787274374411116266ee66455a67c127b8d558c1 (commit)
       via  ae2cdd27af5a1a143020c8477d1e61068f21a4a4 (commit)
      from  b07beb68bf2adf65e837669be0c7464852f829ac (commit)

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


- Log -----------------------------------------------------------------
commit 787274374411116266ee66455a67c127b8d558c1
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 24 10:35:10 2010 +0100

    In ctdb catdb, print the payload data length without the ctdb header length

commit ae2cdd27af5a1a143020c8477d1e61068f21a4a4
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Feb 22 15:04:16 2010 +0100

    Fix a typo in run_startrecovery_eventscript

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

Summary of changes:
 client/ctdb_client.c   |    2 +-
 server/ctdb_recoverd.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 9a89176..9e5f7fc 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -1906,7 +1906,7 @@ int ctdb_dumpdb_record(struct ctdb_context *ctdb, TDB_DATA key, TDB_DATA data, v
 	fprintf(f, "dmaster: %u\n", h->dmaster);
 	fprintf(f, "rsn: %llu\n", (unsigned long long)h->rsn);
 
-	fprintf(f, "data(%u) = \"", (unsigned)data.dsize);
+	fprintf(f, "data(%u) = \"", (unsigned)data.dsize - sizeof(*h));
 	for (i=sizeof(*h);i<data.dsize;i++) {
 		if (ISASCII(data.dptr[i])) {
 			fprintf(f, "%c", data.dptr[i]);
diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index ebcca1b..949a1bc 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -212,7 +212,7 @@ static int run_startrecovery_eventscript(struct ctdb_recoverd *rec, struct ctdb_
 static void async_getcap_callback(struct ctdb_context *ctdb, uint32_t node_pnn, int32_t res, TDB_DATA outdata, void *callback_data)
 {
 	if ( (outdata.dsize != sizeof(uint32_t)) || (outdata.dptr == NULL) ) {
-		DEBUG(DEBUG_ERR, (__location__ " Invalid lenght/pointer for getcap callback : %u %p\n",  (unsigned)outdata.dsize, outdata.dptr));
+		DEBUG(DEBUG_ERR, (__location__ " Invalid length/pointer for getcap callback : %u %p\n",  (unsigned)outdata.dsize, outdata.dptr));
 		return;
 	}
 	if (node_pnn < ctdb->num_nodes) {


-- 
CTDB repository