Rev 123: merge from ronnie in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 123
revision-id: tridge at samba.org-20070417013019-9960402b3fe6f53e
parent: tridge at samba.org-20070417012659-f05788b9fd8c5d2e
parent: ronniesahlberg at gmail.com-20070417001544-1yn8m2kuv2rq4gha
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Tue 2007-04-17 11:30:19 +1000
message:
  merge from ronnie
modified:
  common/ctdb_client.c           ctdb_client.c-20070411010216-3kd8v37k61steeya-1
  common/ctdb_daemon.c           ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
    ------------------------------------------------------------
    merged: ronniesahlberg at gmail.com-20070417001544-1yn8m2kuv2rq4gha
    parent: ronniesahlberg at gmail.com-20070416233713-rhwr7kumq4ep0z8e
    committer: Ronnie sahlberg <ronniesahlberg at gmail.com>
    branch nick: ctdb
    timestamp: Tue 2007-04-17 10:15:44 +1000
    message:
      change some error printouts to make it easier to determine whether the error occured in the client or in the daemon
    ------------------------------------------------------------
    merged: ronniesahlberg at gmail.com-20070416233713-rhwr7kumq4ep0z8e
    parent: ronniesahlberg at gmail.com-20070416060308-8pqh272no0bgiimd
    parent: tridge at samba.org-20070416231820-74f66bb640e03880
    committer: Ronnie sahlberg <ronniesahlberg at gmail.com>
    branch nick: ctdb
    timestamp: Tue 2007-04-17 09:37:13 +1000
    message:
      merge from tridge
    ------------------------------------------------------------
    merged: ronniesahlberg at gmail.com-20070416060308-8pqh272no0bgiimd
    parent: ronniesahlberg at gmail.com-20070416044509-85rjd1uwfjekn2pc
    parent: tridge at samba.org-20070416060137-6d90f720fec05ba5
    committer: Ronnie sahlberg <ronniesahlberg at gmail.com>
    branch nick: ctdb
    timestamp: Mon 2007-04-16 16:03:08 +1000
    message:
      merge from tridge
    ------------------------------------------------------------
    merged: ronniesahlberg at gmail.com-20070416044509-85rjd1uwfjekn2pc
    parent: ronniesahlberg at gmail.com-20070416025048-taxc01rc8zxvgebz
    parent: tridge at samba.org-20070416041310-3f6200073a57aeff
    committer: Ronnie sahlberg <ronniesahlberg at gmail.com>
    branch nick: ctdb
    timestamp: Mon 2007-04-16 14:45:09 +1000
    message:
      merge from tridge
    ------------------------------------------------------------
    merged: ronniesahlberg at gmail.com-20070416025048-taxc01rc8zxvgebz
    parent: ronniesahlberg at gmail.com-20070415223727-ps2603m9yf67eprd
    parent: tridge at samba.org-20070416003139-ac731d5336e759e3
    committer: Ronnie sahlberg <ronniesahlberg at gmail.com>
    branch nick: ctdb
    timestamp: Mon 2007-04-16 12:50:48 +1000
    message:
      merge from tridge
=== modified file 'common/ctdb_client.c'
--- a/common/ctdb_client.c	2007-04-16 00:21:44 +0000
+++ b/common/ctdb_client.c	2007-04-17 00:15:44 +0000
@@ -114,23 +114,23 @@
 	struct ctdb_req_header *hdr;
 
 	if (cnt < sizeof(*hdr)) {
-		ctdb_set_error(ctdb, "Bad packet length %d\n", cnt);
+		ctdb_set_error(ctdb, "Bad packet length %d in client\n", cnt);
 		return;
 	}
 	hdr = (struct ctdb_req_header *)data;
 	if (cnt != hdr->length) {
-		ctdb_set_error(ctdb, "Bad header length %d expected %d\n", 
+		ctdb_set_error(ctdb, "Bad header length %d expected %d in client\n", 
 			       hdr->length, cnt);
 		return;
 	}
 
 	if (hdr->ctdb_magic != CTDB_MAGIC) {
-		ctdb_set_error(ctdb, "Non CTDB packet rejected\n");
+		ctdb_set_error(ctdb, "Non CTDB packet rejected in client\n");
 		return;
 	}
 
 	if (hdr->ctdb_version != CTDB_VERSION) {
-		ctdb_set_error(ctdb, "Bad CTDB version 0x%x rejected\n", hdr->ctdb_version);
+		ctdb_set_error(ctdb, "Bad CTDB version 0x%x rejected in client\n", hdr->ctdb_version);
 		return;
 	}
 

=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c	2007-04-17 01:26:59 +0000
+++ b/common/ctdb_daemon.c	2007-04-17 01:30:19 +0000
@@ -85,7 +85,7 @@
 	r->srvid         = srvid;
 	r->datalen       = data.dsize;
 	memcpy(&r->data[0], data.dptr, data.dsize);
-	
+
 	ctdb_queue_send(client->queue, (uint8_t *)&r->hdr, len);
 
 	talloc_free(r);
@@ -417,12 +417,12 @@
 	struct ctdb_req_header *hdr = data;
 
 	if (hdr->ctdb_magic != CTDB_MAGIC) {
-		ctdb_set_error(client->ctdb, "Non CTDB packet rejected\n");
+		ctdb_set_error(client->ctdb, "Non CTDB packet rejected in daemon\n");
 		goto done;
 	}
 
 	if (hdr->ctdb_version != CTDB_VERSION) {
-		ctdb_set_error(client->ctdb, "Bad CTDB version 0x%x rejected\n", hdr->ctdb_version);
+		ctdb_set_error(client->ctdb, "Bad CTDB version 0x%x rejected in daemon\n", hdr->ctdb_version);
 		goto done;
 	}
 
@@ -468,12 +468,12 @@
 	}
 
 	if (cnt < sizeof(*hdr)) {
-		ctdb_set_error(client->ctdb, "Bad packet length %d\n", cnt);
+		ctdb_set_error(client->ctdb, "Bad packet length %d in daemon\n", cnt);
 		return;
 	}
 	hdr = (struct ctdb_req_header *)data;
 	if (cnt != hdr->length) {
-		ctdb_set_error(client->ctdb, "Bad header length %d expected %d\n", 
+		ctdb_set_error(client->ctdb, "Bad header length %d expected %d\n in daemon", 
 			       hdr->length, cnt);
 		return;
 	}
@@ -484,7 +484,7 @@
 	}
 
 	if (hdr->ctdb_version != CTDB_VERSION) {
-		ctdb_set_error(client->ctdb, "Bad CTDB version 0x%x rejected\n", hdr->ctdb_version);
+		ctdb_set_error(client->ctdb, "Bad CTDB version 0x%x rejected in daemon\n", hdr->ctdb_version);
 		return;
 	}