modules/backend/corestorage: respect general::db_save_blocking

We're not just called from the periodic commit timer, but also
on rehash, which includes some modreloads too (when reloading a
module that has configuration options).

We should always use a blocking save regardless of what caused
the save to happen, rather than just test in the periodic commit
timer callback.

This makes running under Valgrind much more amenable.

Fixes: b427d04059d4d4f7b396

diff --git a/libathemecore/atheme.c b/libathemecore/atheme.c
index be81f0a5f258e49d914a7ae775f4705b1959f37f..d6a7d0b3186f236a8fc1afb390d84f497d847183 100644 (file)
--- a/libathemecore/atheme.c
+++ b/libathemecore/atheme.c
@@ -381,10 +381,7 @@ db_save_periodic(void *unused)
 {
        slog(LG_DEBUG, "db_save_periodic(): initiating periodic database write");
 
-       if (config_options.db_save_blocking)
-               db_save(unused, DB_SAVE_BLOCKING);
-       else
-               db_save(unused, DB_SAVE_BG_REGULAR);
+       db_save(unused, DB_SAVE_BG_REGULAR);
 }
 
 int

diff --git a/modules/backend/corestorage.c b/modules/backend/corestorage.c
index 6ca617105790304cfb3d4362aec3374f9352f6ea..5d3ce4eee2f940fb5acf1fc938a9b32353ebbd3f 100644 (file)
--- a/modules/backend/corestorage.c
+++ b/modules/backend/corestorage.c
@@ -1088,7 +1088,6 @@ corestorage_db_write(void *filename, enum db_save_strategy strategy)
 #ifndef HAVE_FORK
        corestorage_db_write_blocking(filename);
 #else
-
        if (child_pid && strategy == DB_SAVE_BG_REGULAR)
        {
                slog(LG_DEBUG, "db_save(): previous save unfinished, skipping save");
@@ -1105,6 +1104,9 @@ corestorage_db_write(void *filename, enum db_save_strategy strategy)
                }
        }
 
+       if (config_options.db_save_blocking)
+               strategy = DB_SAVE_BLOCKING;
+
        if (strategy == DB_SAVE_BLOCKING)
        {
                corestorage_db_write_blocking(filename);