From cbc736c6fd45401b653454914a1b437050600a00 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Tue, 21 Jul 2015 20:57:12 +0200
Subject: [PATCH] Disable houskeeping and wait for active background jobs to
 finish before attemtpting migrating.

---
 citadel/housekeeping.c                 | 57 ++++++++++++++++++++++++++
 citadel/include/ctdl_module.h          |  6 +++
 citadel/modules/migrate/serv_migrate.c |  4 +-
 3 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 11be04e00..923362777 100644
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -129,3 +129,60 @@ void do_housekeeping(void) {
 	housekeeping_in_progress = 0;
 	end_critical_section(S_HOUSEKEEPING);
 }
+
+void CtdlDisableHouseKeeping(void)
+{
+	int ActiveBackgroundJobs;
+	int do_housekeeping_now = 0;
+	struct CitContext *nptr;
+	int nContexts, i;
+
+retry_block_housekeeping:
+	syslog(LOG_INFO, "trying to disable housekeeping services");
+	begin_critical_section(S_HOUSEKEEPING);
+	if (housekeeping_in_progress == 0) {
+		do_housekeeping_now = 1;
+		housekeeping_in_progress = 1;
+	}
+	end_critical_section(S_HOUSEKEEPING);
+	if (do_housekeeping_now == 0) {
+		usleep(1000000);
+		goto retry_block_housekeeping;
+	}
+	
+	syslog(LOG_INFO, "checking for running server Jobs");
+
+retry_wait_for_contexts:
+	/* So that we don't keep the context list locked for a long time
+	 * we create a copy of it first
+	 */
+	ActiveBackgroundJobs = 0;
+	nptr = CtdlGetContextArray(&nContexts) ;
+	if (nptr)
+	{
+		for (i=0; i<nContexts; i++) 
+		{
+			if ((nptr[i].state != CON_SYS) || (nptr[i].IO == NULL) || (nptr[i].lastcmd == 0))
+				continue;
+			ActiveBackgroundJobs ++;
+			syslog(LOG_INFO, "Job CC[%d] active; use TERM if you don't want to wait for it",nptr[i].cs_pid);
+		
+		}
+	
+		free(nptr);
+
+	}
+	if (ActiveBackgroundJobs != 0) {
+		syslog(LOG_INFO, "found %d running jobs, need to wait", ActiveBackgroundJobs);
+		usleep(5000000);
+		goto retry_wait_for_contexts;
+	}
+	syslog(LOG_INFO, "Housekeeping disabled now.");
+}
+
+void CtdlEnableHouseKeeping(void)
+{
+	begin_critical_section(S_HOUSEKEEPING);
+	housekeeping_in_progress = 0;
+	end_critical_section(S_HOUSEKEEPING);
+}
diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h
index 05a5a7037..ba6a881c8 100644
--- a/citadel/include/ctdl_module.h
+++ b/citadel/include/ctdl_module.h
@@ -168,6 +168,12 @@ void CtdlRegisterMaintenanceThread(char *name, void *(*thread_proc) (void *arg))
 
 void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name);
 
+/*
+ * if you say a) (which may take a while)
+ * don't forget to say b)
+ */
+void CtdlDisableHouseKeeping(void);
+void CtdlEnableHouseKeeping(void);
 
 /*
  * Directory services hooks for LDAP etc
diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c
index 7dbbdee5f..3f9ee3a49 100644
--- a/citadel/modules/migrate/serv_migrate.c
+++ b/citadel/modules/migrate/serv_migrate.c
@@ -883,6 +883,7 @@ void cmd_migr(char *cmdbuf) {
 	
 	if (CtdlTrySingleUser())
 	{
+		CtdlDisableHouseKeeping();
 		CtdlMakeTempFileName(migr_tempfilename1, sizeof migr_tempfilename1);
 		CtdlMakeTempFileName(migr_tempfilename2, sizeof migr_tempfilename2);
 
@@ -902,7 +903,8 @@ void cmd_migr(char *cmdbuf) {
 
 		unlink(migr_tempfilename1);
 		unlink(migr_tempfilename2);
-		
+
+		CtdlEnableHouseKeeping();
 		CtdlEndSingleUser();
 	}
 	else
-- 
2.30.2