[SCM] CTDB repository - branch master updated - db6bc3745a56cc12e60e727190a098a6527690d6

[Andrew Tridgell]

The branch, master has been updated
       via  db6bc3745a56cc12e60e727190a098a6527690d6 (commit)
       via  3059ab5f3f21e331b80728773c36a74620e46677 (commit)
       via  e75cc3a030a8ccb43961cf80ff10d41ec81a24b0 (commit)
       via  a4814aa8b0b165b9d6c4c55fc5aee33cd1a570bd (commit)
      from  b3b9707dd8244758ff1080401a9e03e74766e1ab (commit)

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


- Log -----------------------------------------------------------------
commit db6bc3745a56cc12e60e727190a098a6527690d6
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Aug 8 22:06:39 2008 +1000

    fixed send of release IP message

commit 3059ab5f3f21e331b80728773c36a74620e46677
Merge: e75cc3a030a8ccb43961cf80ff10d41ec81a24b0 b3b9707dd8244758ff1080401a9e03e74766e1ab
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Fri Aug 8 13:11:07 2008 +1000

    Merge git://git.samba.org/tridge/ctdb

commit e75cc3a030a8ccb43961cf80ff10d41ec81a24b0
Merge: a4814aa8b0b165b9d6c4c55fc5aee33cd1a570bd 7c6b621f7307dc39ffcd7d965ac613642af201b8
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Fri Aug 8 10:59:40 2008 +1000

    Merge git://git.samba.org/tridge/ctdb

commit a4814aa8b0b165b9d6c4c55fc5aee33cd1a570bd
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Fri Aug 8 10:01:20 2008 +1000

    new version 1.0.54

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

Summary of changes:
 packaging/RPM/ctdb.spec |    6 +++++-
 server/ctdb_takeover.c  |    7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 24e78fe..ea9ffbd 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -5,7 +5,7 @@ Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
 Version: 1.0
-Release: 53.transactions2
+Release: 54
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -118,6 +118,10 @@ fi
 %{_includedir}/ctdb_private.h
 
 %changelog
+* Fri Aug 8 2008 : Version 1.0.54
+ - fix a looping error in the transaction code
+ - provide a more detailed error code for persistent store errors
+   so clients can make more intelligent choices on how to try to recover
 * Thu Aug 7 2008 : Version 1.0.53
  - Remove the reclock.pnn file   it can cause gpfs to fail to umount
  - New transaction code
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 10369d4..53f48c1 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -304,13 +304,18 @@ static void release_ip_callback(struct ctdb_context *ctdb, int status,
 	/* send a message to all clients of this node telling them
 	   that the cluster has been reconfigured and they should
 	   release any sockets on this IP */
+#if 1
+	strncpy(ip, inet_ntoa(state->addr->ip.sin_addr), sizeof(ip)-1);
+#else
 	if (inet_ntop(state->addr->sa.sa_family, &state->addr->sa.sa_data[0], ip, sizeof(ip)) == NULL) {
 		DEBUG(DEBUG_ERR, (__location__ " inet_ntop() failed\n"));
 	}
-	
+#endif
 	data.dptr = (uint8_t *)ip;
 	data.dsize = strlen(ip)+1;
 
+	DEBUG(DEBUG_INFO,(__location__ " sending RELEASE_IP for '%s'\n", data.dptr));
+
 	ctdb_daemon_send_message(ctdb, ctdb->pnn, CTDB_SRVID_RELEASE_IP, data);
 
 	/* kill clients that have registered with this IP */


-- 
CTDB repository