From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: Hailiang Zhang <zhang.zhanghailiang@huawei.com>
Cc: lizhijian@cn.fujitsu.com, quintela@redhat.com,
yunhong.jiang@intel.com, eddie.dong@intel.com,
peter.huangpeng@huawei.com, qemu-devel@nongnu.org,
arei.gonglei@huawei.com, stefanha@redhat.com,
amit.shah@redhat.com, hongyang.yang@easystack.cn
Subject: Re: [Qemu-devel] [PATCH COLO-Frame v11 27/39] COLO failover: Shutdown related socket fd when do failover
Date: Fri, 11 Dec 2015 09:18:34 +0000 [thread overview]
Message-ID: <20151211091834.GA2987@work-vm> (raw)
In-Reply-To: <566A8FDC.3070303@huawei.com>
* Hailiang Zhang (zhang.zhanghailiang@huawei.com) wrote:
> On 2015/12/11 4:03, Dr. David Alan Gilbert wrote:
> >* zhanghailiang (zhang.zhanghailiang@huawei.com) wrote:
> >>If the net connection between COLO's two sides is broken while colo/colo incoming
> >>thread is blocked in 'read'/'write' socket fd. It will not detect this error until
> >>connect timeout. It will be a long time.
> >>
> >>Here we shutdown all the related socket file descriptors to wake up the blocking
> >>operation in failover BH. Besides, we should close the corresponding file descriptors
> >>after failvoer BH shutdown them, or there will be an error.
> >>
> >>Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
> >>Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
> >>---
> >>v11:
> >>- Only shutdown fd for once
> >>---
> >> migration/colo.c | 31 +++++++++++++++++++++++++++++--
> >> 1 file changed, 29 insertions(+), 2 deletions(-)
> >>
> >>diff --git a/migration/colo.c b/migration/colo.c
> >>index 4cd7b00..994b80d 100644
> >>--- a/migration/colo.c
> >>+++ b/migration/colo.c
> >>@@ -68,6 +68,14 @@ static void secondary_vm_do_failover(void)
> >> /* recover runstate to normal migration finish state */
> >> autostart = true;
> >> }
> >>+ /*
> >>+ * Make sure colo incoming thread not block in recv,
> >>+ * mis->from_src_file and mis->to_src_file use the same fd,
> >>+ * so here we only need to shutdown it for once.
> >>+ */
> >
> >That assumption is only valid for the current socket transport;
> >for example I have a (partially-working) RDMA transport where the
> >forward and reverse paths are quite separate.
> >
>
> Yes, you are right, but we really catch the bad stuck case in test for many times,
> and it is easy to reproduce. So i think it's necessary to keep this codes.
Yes, I agree you must shutdown from_src_file, but I mean do you also need to
shutdown to_src_file ? On sockets they share an fd, but that might not always be
true, so you might have to shutdown both QEMUFile's - but only if you can
get blocked on them.
>
> >>+ if (mis->from_src_file) {
> >>+ qemu_file_shutdown(mis->from_src_file);
> >>+ }
> >>
> >> old_state = failover_set_state(FAILOVER_STATUS_HANDLING,
> >> FAILOVER_STATUS_COMPLETED);
> >>@@ -92,6 +100,15 @@ static void primary_vm_do_failover(void)
> >> MIGRATION_STATUS_COMPLETED);
> >> }
> >>
> >>+ /*
> >>+ * Make sure colo thread no block in recv,
> >>+ * Besides, s->rp_state.from_dst_file and s->to_dst_file use the
> >>+ * same fd, so here we only need to shutdown it for once.
> >>+ */
> >>+ if (s->to_dst_file) {
> >>+ qemu_file_shutdown(s->to_dst_file);
> >>+ }
> >>+
> >> old_state = failover_set_state(FAILOVER_STATUS_HANDLING,
> >> FAILOVER_STATUS_COMPLETED);
> >> if (old_state != FAILOVER_STATUS_HANDLING) {
> >>@@ -333,7 +350,7 @@ static void colo_process_checkpoint(MigrationState *s)
> >>
> >> out:
> >> current_time = error_time = qemu_clock_get_ms(QEMU_CLOCK_HOST);
> >>- if (ret < 0) {
> >>+ if (ret < 0 || (!ret && !failover_request_is_active())) {
> >
> >Why is this needed - when would you get a 0 return that is actually an error?
> >
>
> If we shutdown the fd, it will return 0, and the ret will be 0, this only happen
> when we do failover actively.
OK
> >> error_report("%s: %s", __func__, strerror(-ret));
> >> qapi_event_send_colo_exit(COLO_MODE_PRIMARY, COLO_EXIT_REASON_ERROR,
> >> true, strerror(-ret), NULL);
> >>@@ -362,6 +379,11 @@ out:
> >> qsb_free(buffer);
> >> buffer = NULL;
> >>
> >>+ /* Hope this not to be too long to loop here */
> >>+ while (failover_get_state() != FAILOVER_STATUS_COMPLETED) {
> >>+ ;
> >>+ }
> >>+ /* Must be called after failover BH is completed */
> >
> >Is this the right patch for this?
> >
>
> Yes, we must ensure the close() called after the shutdown() in failover,
> or there maybe an shutdown wrong 'fd' error, the 'fd' maybe just re-used by
> other thread after we close here, but before shutdown() in failover. This
> is a race case, which is rarely happening. I'll add more comments here.
Thanks, that makes sense; closing the wrong fd can be really hard to debug :-)
Dave
>
> Thanks,
> Hailiang
>
>
> >> if (s->rp_state.from_dst_file) {
> >> qemu_fclose(s->rp_state.from_dst_file);
> >> }
> >>@@ -534,7 +556,7 @@ void *colo_process_incoming_thread(void *opaque)
> >>
> >> out:
> >> current_time = error_time = qemu_clock_get_ms(QEMU_CLOCK_HOST);
> >>- if (ret < 0) {
> >>+ if (ret < 0 || (!ret && !failover_request_is_active())) {
> >> error_report("colo incoming thread will exit, detect error: %s",
> >> strerror(-ret));
> >> qapi_event_send_colo_exit(COLO_MODE_SECONDARY, COLO_EXIT_REASON_ERROR,
> >>@@ -573,6 +595,11 @@ out:
> >> */
> >> colo_release_ram_cache();
> >>
> >>+ /* Hope this not to be too long to loop here */
> >>+ while (failover_get_state() != FAILOVER_STATUS_COMPLETED) {
> >>+ ;
> >>+ }
> >>+ /* Must be called after failover BH is completed */
> >> if (mis->to_src_file) {
> >> qemu_fclose(mis->to_src_file);
> >> }
> >>--
> >>1.8.3.1
> >>
> >>
> >--
> >Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
> >
> >.
> >
>
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
next prev parent reply other threads:[~2015-12-11 9:18 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-24 9:25 [Qemu-devel] [PATCH COLO-Frame v11 00/39] COarse-grain LOck-stepping(COLO) Virtual Machines for Non-stop Service (FT) zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 01/39] configure: Add parameter for configure to enable/disable COLO support zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 02/39] migration: Introduce capability 'x-colo' to migration zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 03/39] COLO: migrate colo related info to secondary node zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 04/39] migration: Export migrate_set_state() zhanghailiang
2015-11-24 17:31 ` Dr. David Alan Gilbert
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 05/39] migration: Add state records for migration incoming zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 06/39] migration: Integrate COLO checkpoint process into migration zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 07/39] migration: Integrate COLO checkpoint process into loadvm zhanghailiang
2015-11-24 18:14 ` Dr. David Alan Gilbert
2015-11-25 6:39 ` zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 08/39] migration: Rename the'file' member of MigrationState zhanghailiang
2015-11-24 18:26 ` Dr. David Alan Gilbert
2015-11-25 6:48 ` zhanghailiang
2015-12-10 6:41 ` Wen Congyang
2015-12-11 3:40 ` Hailiang Zhang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 09/39] COLO/migration: Create a new communication path from destination to source zhanghailiang
2015-11-24 18:40 ` Dr. David Alan Gilbert
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 10/39] COLO: Implement colo checkpoint protocol zhanghailiang
2015-11-24 19:00 ` Dr. David Alan Gilbert
2015-11-25 14:01 ` Eric Blake
2015-11-26 6:52 ` Hailiang Zhang
2015-11-26 7:12 ` Hailiang Zhang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 11/39] COLO: Add a new RunState RUN_STATE_COLO zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 12/39] QEMUSizedBuffer: Introduce two help functions for qsb zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 13/39] COLO: Save PVM state to secondary side when do checkpoint zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 14/39] ram: Split host_from_stream_offset() into two helper functions zhanghailiang
2015-12-01 18:19 ` Dr. David Alan Gilbert
2015-12-03 7:19 ` Hailiang Zhang
2015-12-03 7:29 ` Hailiang Zhang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 15/39] COLO: Load PVM's dirty pages into SVM's RAM cache temporarily zhanghailiang
2015-12-01 19:02 ` Dr. David Alan Gilbert
2015-12-03 8:25 ` Hailiang Zhang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 16/39] ram/COLO: Record the dirty pages that SVM received zhanghailiang
2015-12-01 19:36 ` Dr. David Alan Gilbert
2015-12-03 8:29 ` Hailiang Zhang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 17/39] COLO: Load VMState into qsb before restore it zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 18/39] COLO: Flush PVM's cached RAM into SVM's memory zhanghailiang
2015-11-27 5:29 ` Li Zhijian
2015-12-01 12:02 ` Hailiang Zhang
2015-12-01 20:06 ` Dr. David Alan Gilbert
2015-12-03 8:50 ` Hailiang Zhang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 19/39] COLO: Add checkpoint-delay parameter for migrate-set-parameters zhanghailiang
2015-12-09 18:50 ` Dr. David Alan Gilbert
2015-12-11 3:20 ` Hailiang Zhang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 20/39] COLO: synchronize PVM's state to SVM periodically zhanghailiang
2015-12-09 18:53 ` Dr. David Alan Gilbert
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 21/39] COLO failover: Introduce a new command to trigger a failover zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 22/39] COLO failover: Introduce state to record failover process zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 23/39] COLO: Implement failover work for Primary VM zhanghailiang
2015-12-10 18:34 ` Dr. David Alan Gilbert
2015-12-11 7:54 ` Hailiang Zhang
2015-12-11 9:22 ` Dr. David Alan Gilbert
2015-12-11 9:38 ` Hailiang Zhang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 24/39] COLO: Implement failover work for Secondary VM zhanghailiang
2015-12-10 18:50 ` Dr. David Alan Gilbert
2015-12-11 8:27 ` Hailiang Zhang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 25/39] COLO: implement default failover treatment zhanghailiang
2015-12-10 19:01 ` Dr. David Alan Gilbert
2015-12-11 9:48 ` Hailiang Zhang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 26/39] qmp event: Add event notification for COLO error zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 27/39] COLO failover: Shutdown related socket fd when do failover zhanghailiang
2015-12-10 20:03 ` Dr. David Alan Gilbert
2015-12-11 8:57 ` Hailiang Zhang
2015-12-11 9:18 ` Dr. David Alan Gilbert [this message]
2015-12-11 9:29 ` Hailiang Zhang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 28/39] COLO failover: Don't do failover during loading VM's state zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 29/39] COLO: Process shutdown command for VM in COLO state zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 30/39] COLO: Update the global runstate after going into colo state zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 31/39] savevm: Split load vm state function qemu_loadvm_state zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 32/39] COLO: Separate the process of saving/loading ram and device state zhanghailiang
2015-11-27 5:10 ` Li Zhijian
2015-12-01 12:07 ` Hailiang Zhang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 33/39] COLO: Split qemu_savevm_state_begin out of checkpoint process zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 34/39] net/filter-buffer: Add default filter-buffer for each netdev zhanghailiang
2015-11-27 11:39 ` Yang Hongyang
2015-11-28 5:55 ` Hailiang Zhang
2015-11-30 1:19 ` Li Zhijian
2015-12-01 8:56 ` Hailiang Zhang
2015-12-03 1:17 ` Wen Congyang
2015-12-03 3:53 ` Hailiang Zhang
2015-12-03 6:25 ` Wen Congyang
2015-12-03 6:48 ` Hailiang Zhang
2015-12-03 7:21 ` Yang Hongyang
2015-12-03 8:37 ` Hailiang Zhang
2015-12-07 7:38 ` Hailiang Zhang
2015-12-08 1:49 ` Yang Hongyang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 35/39] filter-buffer: Accept zero interval zhanghailiang
2015-11-27 11:42 ` Yang Hongyang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 36/39] filter-buffer: Introduce a helper function to enable/disable default filter zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 37/39] filter-buffer: Introduce a helper function to release packets zhanghailiang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 38/39] colo: Use default buffer-filter to buffer and " zhanghailiang
2015-11-27 12:51 ` Yang Hongyang
2015-11-28 6:15 ` Hailiang Zhang
2015-11-24 9:25 ` [Qemu-devel] [PATCH COLO-Frame v11 39/39] COLO: Add block replication into colo process zhanghailiang
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=20151211091834.GA2987@work-vm \
--to=dgilbert@redhat.com \
--cc=amit.shah@redhat.com \
--cc=arei.gonglei@huawei.com \
--cc=eddie.dong@intel.com \
--cc=hongyang.yang@easystack.cn \
--cc=lizhijian@cn.fujitsu.com \
--cc=peter.huangpeng@huawei.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=stefanha@redhat.com \
--cc=yunhong.jiang@intel.com \
--cc=zhang.zhanghailiang@huawei.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).