From 5299b7e0e2c4f832f91ab5e26d44398cc4bd8a3f Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 17 Apr 2007 15:32:49 +1000
Subject: now that both daemon and client access the database, it needs to be a
 real disk file (This used to be ctdb commit
 5159f3a61f41bbaf563edd8d901a6bf5bfee4e4e)

---
 ctdb/common/ctdb_ltdb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ctdb/common/ctdb_ltdb.c b/ctdb/common/ctdb_ltdb.c
index c523d5f995..e2aa47e4cd 100644
--- a/ctdb/common/ctdb_ltdb.c
+++ b/ctdb/common/ctdb_ltdb.c
@@ -85,7 +85,7 @@ struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, const char *name,
 	/* when we have a separate daemon this will need to be a real
 	   file, not a TDB_INTERNAL, so the parent can access it to
 	   for ltdb bypass */
-	ctdb_db->ltdb = tdb_wrap_open(ctdb, name, 0, TDB_INTERNAL, open_flags, mode);
+	ctdb_db->ltdb = tdb_wrap_open(ctdb, name, 0, TDB_DEFAULT, open_flags, mode);
 	if (ctdb_db->ltdb == NULL) {
 		ctdb_set_error(ctdb, "Failed to open tdb %s\n", name);
 		talloc_free(ctdb_db);
-- 
cgit 


From b87de399f2037be2a689f8df8e97f20f32fdce46 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 17 Apr 2007 15:33:20 +1000
Subject: block SIGPIPE in the daemon to prevent a SIGPIPE on write to a dead
 socket (This used to be ctdb commit 02c09dc07c9bed57ca3692b14e41ac8cca0a29f4)

---
 ctdb/common/ctdb_daemon.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/ctdb/common/ctdb_daemon.c b/ctdb/common/ctdb_daemon.c
index 5a90003bc0..67653202af 100644
--- a/ctdb/common/ctdb_daemon.c
+++ b/ctdb/common/ctdb_daemon.c
@@ -25,6 +25,7 @@
 #include "lib/util/dlinklist.h"
 #include "system/network.h"
 #include "system/filesys.h"
+#include "system/wait.h"
 #include "../include/ctdb.h"
 #include "../include/ctdb_private.h"
 
@@ -47,6 +48,18 @@ static void set_non_blocking(int fd)
         fcntl(fd, F_SETFL, v | O_NONBLOCK);
 }
 
+static void block_signal(int signum)
+{
+	struct sigaction act;
+
+	memset(&act, 0, sizeof(act));
+
+	act.sa_handler = SIG_IGN;
+	sigemptyset(&act.sa_mask);
+	sigaddset(&act.sa_mask, signum);
+	sigaction(signum, &act, NULL);
+}
+
 
 /*
   structure describing a connected client in the daemon
@@ -558,6 +571,8 @@ int ctdb_start(struct ctdb_context *ctdb)
 		return 0;
 	}
 
+	block_signal(SIGPIPE);
+
 	/* ensure the socket is deleted on exit of the daemon */
 	domain_socket_name = talloc_strdup(talloc_autofree_context(), ctdb->daemon.name);
 	talloc_set_destructor(domain_socket_name, unlink_destructor);	
-- 
cgit 


From ae6722e84568cda9b3dc494a3e7fd10bbeacdb8c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 17 Apr 2007 15:33:58 +1000
Subject: make sure we unlock (This used to be ctdb commit
 c09054f878a88129abb6cce24c7bbf53f61a2648)

---
 ctdb/tests/ctdb_fetch.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ctdb/tests/ctdb_fetch.c b/ctdb/tests/ctdb_fetch.c
index 33396fe4f3..35ab989299 100644
--- a/ctdb/tests/ctdb_fetch.c
+++ b/ctdb/tests/ctdb_fetch.c
@@ -89,6 +89,7 @@ static void bench_fetch_1node(struct ctdb_context *ctdb)
 	data.dsize = strlen((const char *)data.dptr)+1;
 
 	ret = ctdb_record_store(h, data);
+	talloc_free(h);
 	if (ret != 0) {
 		printf("Failed to store record\n");
 	}
-- 
cgit