[sheepdog] [PATCH stable-0.6 RFC] recovery: free recovery info before stopping recovery

Hitoshi Mitake mitake.hitoshi at gmail.com
Mon Aug 26 16:57:04 CEST 2013


From: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>

Without this patch, the recovery thread cannot start the next recovery
and the stopped recovery cannot start any more.

Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
Signed-off-by: Liu Yuan <namei.unix at gmail.com>

Conflicts:
	sheep/recovery.c

Manually modified by Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>.
Only modifying the call from sd_debug() to sd_dprintf().

Signed-off-by: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
---
 sheep/recovery.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sheep/recovery.c b/sheep/recovery.c
index 58fad49..6a0efac 100644
--- a/sheep/recovery.c
+++ b/sheep/recovery.c
@@ -613,7 +613,8 @@ static void recover_object_main(struct work *work)
 		 * lifted and flush wait queue to requeue those
 		 * requests
 		 */
-		wakeup_all_requests();
+		rinfo->notify_complete = false;
+		finish_recovery(rinfo);
 		sd_dprintf("recovery is stopped");
 		goto out;
 	}
-- 
1.8.1.2




More information about the sheepdog mailing list