[PATCH v3 4/5] compact: unconditionally remove old wip database compact directory

Tomi Ollila tomi.ollila at iki.fi
Thu Nov 14 14:03:26 PST 2013


In case previous notmuch compact has been interrupted there is old
work-in-progress database compact directory partially filled. Remove
it just before starting to fill the directory with new files.
---
 lib/database.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/database.cc b/lib/database.cc
index d79cc30..d09ad99 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -922,6 +922,12 @@ notmuch_database_compact (const char *path,
 	goto DONE;
     }
 
+    /* Unconditionally attempt to remove old work-in-progress database (if
+     * any). This is "protected" by database lock. If this fails due to write
+     * errors (etc), the following code will fail and provide error message.
+     */
+    (void) rmtree (compact_xapian_path);
+
     try {
 	NotmuchCompactor compactor (status_cb, closure);
 
-- 
1.8.0



More information about the notmuch mailing list