diff options
Diffstat (limited to 'ctdb')
-rw-r--r-- | ctdb/server/ctdb_ltdb_server.c | 34 | ||||
-rw-r--r-- | ctdb/server/ctdbd.c | 5 |
2 files changed, 5 insertions, 34 deletions
diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c index db9bc01295a..234ecac5fcd 100644 --- a/ctdb/server/ctdb_ltdb_server.c +++ b/ctdb/server/ctdb_ltdb_server.c @@ -1235,40 +1235,6 @@ int ctdb_attach_databases(struct ctdb_context *ctdb) char *unhealthy_reason = NULL; bool first_try = true; - if (ctdb->db_directory == NULL) { - ctdb->db_directory = VARDIR "/ctdb"; - } - if (ctdb->db_directory_persistent == NULL) { - ctdb->db_directory_persistent = VARDIR "/ctdb/persistent"; - } - if (ctdb->db_directory_state == NULL) { - ctdb->db_directory_state = VARDIR "/ctdb/state"; - } - - /* make sure the db directory exists */ - ret = mkdir(ctdb->db_directory, 0700); - if (ret == -1 && errno != EEXIST) { - DEBUG(DEBUG_CRIT,(__location__ " Unable to create ctdb directory '%s'\n", - ctdb->db_directory)); - return -1; - } - - /* make sure the persistent db directory exists */ - ret = mkdir(ctdb->db_directory_persistent, 0700); - if (ret == -1 && errno != EEXIST) { - DEBUG(DEBUG_CRIT,(__location__ " Unable to create ctdb persistent directory '%s'\n", - ctdb->db_directory_persistent)); - return -1; - } - - /* make sure the internal state db directory exists */ - ret = mkdir(ctdb->db_directory_state, 0700); - if (ret == -1 && errno != EEXIST) { - DEBUG(DEBUG_CRIT,(__location__ " Unable to create ctdb state directory '%s'\n", - ctdb->db_directory_state)); - return -1; - } - persistent_health_path = talloc_asprintf(ctdb, "%s/%s.%u", ctdb->db_directory_state, PERSISTENT_HEALTH_TDB, diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index f3cb9d3e95f..f9e83f8c3f8 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -263,6 +263,8 @@ int main(int argc, const char *argv[]) exit(1); } } + ctdb_mkdir_p_or_die(ctdb, ctdb->db_directory, 0700); + if (options.db_dir_persistent) { ret = ctdb_set_tdb_dir_persistent(ctdb, options.db_dir_persistent); if (ret == -1) { @@ -270,6 +272,8 @@ int main(int argc, const char *argv[]) exit(1); } } + ctdb_mkdir_p_or_die(ctdb, ctdb->db_directory_persistent, 0700); + if (options.db_dir_state) { ret = ctdb_set_tdb_dir_state(ctdb, options.db_dir_state); if (ret == -1) { @@ -277,6 +281,7 @@ int main(int argc, const char *argv[]) exit(1); } } + ctdb_mkdir_p_or_die(ctdb, ctdb->db_directory_state, 0700); if (options.public_interface) { ctdb->default_public_interface = talloc_strdup(ctdb, options.public_interface); |