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 2/5] remus: resume immediately if libxl__xc_domain_save_done() completes
Date: Fri, 8 Jan 2016 14:38:48 +0800 [thread overview]
Message-ID: <1452235131-1861-3-git-send-email-wency@cn.fujitsu.com> (raw)
In-Reply-To: <1452235131-1861-1-git-send-email-wency@cn.fujitsu.com>
For example: if the secondary host is down, and we fail to send the data to
the secondary host. xc_domain_save() returns 0. So in the function
libxl__xc_domain_save_done(), rc is 0(the helper program exits normally),
and retval is 0(it is xc_domain_save()'s return value). In such case, we
just need to complete the stream.
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
---
tools/libxl/libxl_stream_write.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c
index 80d9208..82e7719 100644
--- a/tools/libxl/libxl_stream_write.c
+++ b/tools/libxl/libxl_stream_write.c
@@ -354,8 +354,17 @@ void libxl__xc_domain_save_done(libxl__egc *egc, void *dss_void,
* alive, and check_all_finished() may have torn it down around us.
* If the stream is not still alive, we must not continue any work.
*/
- if (libxl__stream_write_inuse(stream))
- write_emulator_xenstore_record(egc, stream);
+ if (libxl__stream_write_inuse(stream)) {
+ if (dss->remus)
+ /*
+ * For remus, if libxl__xc_domain_save_done() completes,
+ * there was an error sending data to the secondary.
+ * Resume the primary ASAP.
+ */
+ stream_complete(egc, stream, 0);
+ else
+ write_emulator_xenstore_record(egc, stream);
+ }
}
static void write_emulator_xenstore_record(libxl__egc *egc,
--
2.5.0
next prev parent 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 ` [PATCH v3 1/5] remus: don't call stream_continue() when doing failover Wen Congyang
2016-01-08 16:20 ` 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 ` Wen Congyang [this message]
2016-01-08 9:52 ` [PATCH v3 2/5] remus: resume immediately if libxl__xc_domain_save_done() completes 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-3-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).