summaryrefslogtreecommitdiffstats
path: root/ctdb/server/ctdb_daemon.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-11-29 12:39:23 +0100
committerStefan Metzmacher <metze@samba.org>2009-12-16 08:03:56 +0100
commit9a96ae0c978c553ebd7d1dc5e1abe1f65e093627 (patch)
tree5a02e1f44d88562ef7f0624b38d8d138869c9982 /ctdb/server/ctdb_daemon.c
parentb48228e7f9c76a9bd7a624280c1c3367fa9e9836 (diff)
downloadsamba-9a96ae0c978c553ebd7d1dc5e1abe1f65e093627.tar.gz
samba-9a96ae0c978c553ebd7d1dc5e1abe1f65e093627.tar.xz
samba-9a96ae0c978c553ebd7d1dc5e1abe1f65e093627.zip
server: only do the mkdir() calls for db_directory* once at the start
metze (This used to be ctdb commit f30f33685db50860b6cd6fd1b6bdc3066620a78f)
Diffstat (limited to 'ctdb/server/ctdb_daemon.c')
-rw-r--r--ctdb/server/ctdb_daemon.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index 9ade55aca8..42b2c124b1 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -764,9 +764,9 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog)
ctdb_fatal(ctdb, "transport failed to initialise");
}
- /* attach to any existing persistent databases */
- if (ctdb_attach_persistent(ctdb) != 0) {
- ctdb_fatal(ctdb, "Failed to attach to persistent databases\n");
+ /* attach to existing databases */
+ if (ctdb_attach_databases(ctdb) != 0) {
+ ctdb_fatal(ctdb, "Failed to attach to databases\n");
}
/* start frozen, then let the first election sort things out */