summaryrefslogtreecommitdiffstats
path: root/ctdb/include
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2007-06-02 10:03:28 +1000
committerAndrew Tridgell <tridge@samba.org>2007-06-02 10:03:28 +1000
commit4f72a202d940e414a3e8359fd3929ebd178b836a (patch)
tree02fdc8c3d96b2cdd2249d2d064914dda57fd9925 /ctdb/include
parent69edd8e617f8042f643f789cd7528618c9c9c8ac (diff)
downloadsamba-4f72a202d940e414a3e8359fd3929ebd178b836a.tar.gz
samba-4f72a202d940e414a3e8359fd3929ebd178b836a.tar.xz
samba-4f72a202d940e414a3e8359fd3929ebd178b836a.zip
- moved cmdline options that are only relevant to ctdbd into ctdbd.c
- fixed a valgrind error on failing to send a control - don't mark node dead when already disconnected - moved node list lock code into common code (This used to be ctdb commit bcc0432d0fea7ef223f82ccee81cf35c18144b1b)
Diffstat (limited to 'ctdb/include')
-rw-r--r--ctdb/include/ctdb_private.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index d366c5071d..870cbd7a71 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -357,7 +357,7 @@ struct ctdb_db_context {
#define CTDB_MONITORING_TIMEOUT 2
/* number of monitoring timeouts before a node is considered dead */
-#define CTDB_MONITORING_DEAD_COUNT 2
+#define CTDB_MONITORING_DEAD_COUNT 3
/* number of consecutive calls from the same node before we give them
@@ -970,5 +970,7 @@ void ctdb_release_all_ips(struct ctdb_context *ctdb);
void set_nonblocking(int fd);
void set_close_on_exec(int fd);
+bool ctdb_lock_node_list(struct ctdb_context *ctdb, bool keep);
+
#endif