All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wen Congyang <wency@cn.fujitsu.com>
To: xen devel <xen-devel@lists.xen.org>,
	Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Changlong Xie <xiecl.fnst@cn.fujitsu.com>,
	Wei Liu <wei.liu2@citrix.com>,
	Ian Campbell <ian.campbell@citrix.com>,
	Wen Congyang <wency@cn.fujitsu.com>,
	Ian Jackson <ian.jackson@eu.citrix.com>,
	Shriram Rajagopalan <rshriram@cs.ubc.ca>,
	Yang Hongyang <hongyang.yang@easystack.cn>
Subject: [PATCH v3 1/5] remus: don't call stream_continue() when doing failover
Date: Fri, 8 Jan 2016 14:38:47 +0800	[thread overview]
Message-ID: <1452235131-1861-2-git-send-email-wency@cn.fujitsu.com> (raw)
In-Reply-To: <1452235131-1861-1-git-send-email-wency@cn.fujitsu.com>

stream_continue() is used for migration to read emulator
xenstore data and emulator context. For remus, if we do
failover, we have read it in the checkpoint cycle, and
we only need to complete the stream.

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
 tools/libxl/libxl_stream_read.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/tools/libxl/libxl_stream_read.c b/tools/libxl/libxl_stream_read.c
index 258dec4..65219d5 100644
--- a/tools/libxl/libxl_stream_read.c
+++ b/tools/libxl/libxl_stream_read.c
@@ -758,6 +758,9 @@ void libxl__xc_domain_restore_done(libxl__egc *egc, void *dcs_void,
     libxl__stream_read_state *stream = &dcs->srs;
     STATE_AO_GC(dcs->ao);
 
+    /* convenience aliases */
+    const int checkpointed_stream = dcs->restore_params.checkpointed_stream;
+
     if (rc)
         goto err;
 
@@ -777,11 +780,19 @@ void libxl__xc_domain_restore_done(libxl__egc *egc, void *dcs_void,
      * If the stream is not still alive, we must not continue any work.
      */
     if (libxl__stream_read_inuse(stream)) {
-        /*
-         * Libxc has indicated that it is done with the stream.  Resume reading
-         * libxl records from it.
-         */
-        stream_continue(egc, stream);
+        if (checkpointed_stream) {
+            /*
+             * Failover from primary. Domain state is currently at a
+             * consistent checkpoint, ready to go.
+             */
+            stream_complete(egc, stream, 0);
+        } else {
+            /*
+             * Libxc has indicated that it is done with the stream.
+             * Resume reading libxl records from it.
+             */
+            stream_continue(egc, stream);
+        }
     }
 }
 
-- 
2.5.0

  reply	other threads:[~2016-01-08  6:38 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-08  6:38 [PATCH v3 0/5] migration/remus: bug fix and cleanup Wen Congyang
2016-01-08  6:38 ` Wen Congyang [this message]
2016-01-08 16:20   ` [PATCH v3 1/5] remus: don't call stream_continue() when doing failover Ian Campbell
2016-01-12  1:36     ` Wen Congyang
2016-01-14 10:19       ` Ian Campbell
2016-01-26  6:37   ` Yang Hongyang
2016-01-08  6:38 ` [PATCH v3 2/5] remus: resume immediately if libxl__xc_domain_save_done() completes Wen Congyang
2016-01-08  9:52   ` Andrew Cooper
2016-01-08 16:27   ` Ian Campbell
2016-01-12  1:40     ` Wen Congyang
2016-01-14 10:21       ` Ian Campbell
2016-01-15  5:44         ` Wen Congyang
2016-01-15  9:48           ` Ian Campbell
2016-01-15  9:54             ` Wen Congyang
2016-01-26  6:41   ` Yang Hongyang
2016-01-08  6:38 ` [PATCH v3 3/5] tools/libxc: don't send end record if remus fails Wen Congyang
2016-01-26  6:44   ` Yang Hongyang
2016-01-08  6:38 ` [PATCH v3 4/5] tools/libxc: error handling for the postcopy() callback Wen Congyang
2016-01-26  6:45   ` Yang Hongyang
2016-01-26  6:48     ` Wen Congyang
2016-01-26  7:02       ` Yang Hongyang
2016-01-26 16:08         ` Ian Campbell
2016-01-08  6:38 ` [PATCH v3 5/5] tools/libxl: remove unused function libxl__domain_save_device_model() Wen Congyang
2016-01-08 16:30   ` Ian Campbell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1452235131-1861-2-git-send-email-wency@cn.fujitsu.com \
    --to=wency@cn.fujitsu.com \
    --cc=andrew.cooper3@citrix.com \
    --cc=hongyang.yang@easystack.cn \
    --cc=ian.campbell@citrix.com \
    --cc=ian.jackson@eu.citrix.com \
    --cc=rshriram@cs.ubc.ca \
    --cc=wei.liu2@citrix.com \
    --cc=xen-devel@lists.xen.org \
    --cc=xiecl.fnst@cn.fujitsu.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.