From 794347f5e3b5ce5b94a886f107cb04647aaac281 Mon Sep 17 00:00:00 2001 From: Wen Congyang Date: Tue, 19 Jan 2016 15:17:37 +0800 Subject: [PATCH] remus: don't do failover if we don't have a consistent state We will have a consistent state when a CHECKPOINT_END record is received. After the first CHECKPOINT_END record is received, we will buffer all records until the next CHECKPOINT_END record is received. So if the checkpoint() callback returns XGR_CHECKPOINT_FAILOVER, we only can do failover if ctx->restore.buffer_all_records is true. Signed-off-by: Wen Congyang Acked-by: Ian Campbell Reviewed-by: Andrew Cooper --- tools/libxc/xc_sr_restore.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 05159bb965..6ccdab9b33 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -493,7 +493,11 @@ static int handle_checkpoint(struct xc_sr_context *ctx) break; case XGR_CHECKPOINT_FAILOVER: - rc = BROKEN_CHANNEL; + if ( ctx->restore.buffer_all_records ) + rc = BROKEN_CHANNEL; + else + /* We don't have a consistent state */ + rc = -1; goto err; default: /* Other fatal error */ -- 2.30.2