[PATCH 1/3] notmuch-deliver: wait for the database to become unlocked

[David Riebenbauer]

If notmuch-deliver just gives up on a locked database this can result
in mail bouncing.

This patch makes it wait a given time and then retry to open the
database. The wait time starts at a millisecond, and doubles every
time the database is still locked, until an absolute maximum time of
10 minutes is reached.
---
 contrib/notmuch-deliver/src/main.c |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/contrib/notmuch-deliver/src/main.c b/contrib/notmuch-deliver/src/main.c
index f7a4eaa..e30cbac 100644
--- a/contrib/notmuch-deliver/src/main.c
+++ b/contrib/notmuch-deliver/src/main.c
@@ -71,6 +71,9 @@
 #define EX_CONFIG 78
 #endif
 
+#define MIN_UWAIT 1000        // 1 millisecond
+#define MAX_UWAIT 600000000   // 10 minutes
+
 static gboolean opt_create, opt_fatal, opt_folder, opt_version;
 static gboolean opt_verbose = FALSE;
 static gchar **opt_tags = NULL;
@@ -428,10 +431,26 @@ main(int argc, char **argv)
 		maildir = g_strdup(db_path);
 
 	g_debug("Opening notmuch database `%s'", db_path);
-	db = notmuch_database_open(db_path, NOTMUCH_DATABASE_MODE_READ_WRITE);
+	gint32 wait_time = 0;
+	gint32 next_wait = MIN_UWAIT;
+	while ((db = notmuch_database_open(db_path, NOTMUCH_DATABASE_MODE_READ_WRITE)) == NULL) {
+		g_debug("Retrying to open database in %u microseconds", next_wait);
+		usleep(next_wait);
+
+		next_wait *= 2;
+		if (wait_time + next_wait >= MAX_UWAIT) {
+			wait_time = next_wait - MAX_UWAIT;
+			if (wait_time <= 0) {
+				g_free(db_path);
+				if (db == NULL)
+					return EX_SOFTWARE;
+			}
+		}
+
+		wait_time += next_wait;
+	}
 	g_free(db_path);
-	if (db == NULL)
-		return EX_SOFTWARE;
+
 	if (notmuch_database_needs_upgrade(db)) {
 		g_message("Upgrading database");
 		notmuch_database_upgrade(db, NULL, NULL);
-- 
1.7.7.1