xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Wen Congyang <wency@cn.fujitsu.com>
To: xen devel <xen-devel@lists.xen.org>
Cc: Ian Campbell <Ian.Campbell@citrix.com>,
	Wen Congyang <wency@cn.fujitsu.com>,
	Ian Jackson <Ian.Jackson@eu.citrix.com>,
	Jiang Yunhong <yunhong.jiang@intel.com>,
	Dong Eddie <eddie.dong@intel.com>,
	Shriram Rajagopalan <rshriram@cs.ubc.ca>,
	Yang Hongyang <yanghy@cn.fujitsu.com>,
	Lai Jiangshan <laijs@cn.fujitsu.com>
Subject: [PATCH 10/17] tools: block-remus: fix bug in ctl_request()
Date: Tue, 14 Oct 2014 10:13:58 +0800	[thread overview]
Message-ID: <1413252845-23433-11-git-send-email-wency@cn.fujitsu.com> (raw)
In-Reply-To: <1413252845-23433-1-git-send-email-wency@cn.fujitsu.com>

ctl_request() handles the command which the users writes to ctl fifo. The
user will read the response from msg fifo. This patch fixes the following bugs:
1. If the command is not "flush", we don't respond, and the user will wait
   the forever.
2. If the current mode is not mode_primary, we don't respond in s->queue_flush(),
   so call s->queue_flush() only if the mode is mode_primary.

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Cc: Shriram Rajagopalan <rshriram@cs.ubc.ca>
---
 tools/blktap2/drivers/block-remus.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/blktap2/drivers/block-remus.c b/tools/blktap2/drivers/block-remus.c
index 55363a3..9be47f6 100644
--- a/tools/blktap2/drivers/block-remus.c
+++ b/tools/blktap2/drivers/block-remus.c
@@ -1513,13 +1513,18 @@ static void ctl_request(event_id_t id, char mode, void *private)
 	/* TODO: need to get driver somehow */
 	msg[rc] = '\0';
 	if (!strncmp(msg, "flush", 5)) {
-		if (s->queue_flush)
+		if (s->mode == mode_primary) {
 			if ((rc = s->queue_flush(driver))) {
 				RPRINTF("error passing flush request to backup");
 				ctl_respond(s, TDREMUS_FAIL);
 			}
+		} else {
+			RPRINTF("We are not in primary mode\n");
+			ctl_respond(s, TDREMUS_FAIL);
+		}
 	} else {
 		RPRINTF("unknown command: %s\n", msg);
+		ctl_respond(s, TDREMUS_FAIL);
 	}
 }
 
-- 
1.9.3

  parent reply	other threads:[~2014-10-14  2:13 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-14  2:13 [PATCH 00/17] blktap2 related bugfix patches Wen Congyang
2014-10-14  2:13 ` [PATCH 01/17] tools: blktap2: dynamic allocate aio_requests to avoid -EBUSY error Wen Congyang
2014-10-14  2:13 ` [PATCH 02/17] tools: block-remus: pass uuid to the callback td_open Wen Congyang
2014-10-20  2:58   ` Shriram Rajagopalan
2014-10-14  2:13 ` [PATCH 03/17] tools: block-remus: use correct way to get remus_image Wen Congyang
2014-10-20  3:02   ` Shriram Rajagopalan
2014-10-14  2:13 ` [PATCH 04/17] tools: block-remus: fix bug in tdremus_close() Wen Congyang
2014-10-20  3:01   ` Shriram Rajagopalan
2014-10-20  3:05     ` Wen Congyang
2014-10-14  2:13 ` [PATCH 05/17] tools: block-remus: fix memory leak Wen Congyang
2014-10-20  2:33   ` Shriram Rajagopalan
2014-10-14  2:13 ` [PATCH 06/17] tools: blktap2: return the correct dev path Wen Congyang
2014-10-14  2:13 ` [PATCH 07/17] tools: blktap2: use correct way to get free event id Wen Congyang
2014-10-14  2:13 ` [PATCH 08/17] tools: blktap2: don't return negative " Wen Congyang
2014-10-14  2:13 ` [PATCH 09/17] tools: blktap2: use correct way to define array Wen Congyang
2014-10-20  2:37   ` Shriram Rajagopalan
2014-10-20  2:52     ` Wen Congyang
2014-10-14  2:13 ` Wen Congyang [this message]
2014-10-20  2:38   ` [PATCH 10/17] tools: block-remus: fix bug in ctl_request() Shriram Rajagopalan
2014-10-14  2:13 ` [PATCH 11/17] tools: block-remus: clean unused functions Wen Congyang
2014-10-20  3:01   ` Shriram Rajagopalan
2014-10-14  2:14 ` [PATCH 12/17] tools: blktap2: implement an API to create a connection asynchronously Wen Congyang
2014-10-14  2:14 ` [PATCH 13/17] tools: block-remus: connect to backup asynchronously Wen Congyang
2014-10-20  2:50   ` Shriram Rajagopalan
2014-10-20  3:00     ` Wen Congyang
2014-10-20  3:11       ` Shriram Rajagopalan
2014-10-14  2:14 ` [PATCH 14/17] block-remus: switch to unprotected mode before closing Wen Congyang
2014-10-20  2:51   ` Shriram Rajagopalan
2014-10-14  2:14 ` [PATCH 15/17] tools: blktap2: move ramdisk related codes to block-replication.c Wen Congyang
2014-10-20  2:52   ` Shriram Rajagopalan
2014-10-14  2:14 ` [PATCH 16/17] support blktap remus in xl Wen Congyang
2014-10-14  2:14 ` [PATCH 17/17] HACK: libxl/remus: setup and control disk replication for blktap2 backends Wen Congyang
2014-10-20  3:00   ` Shriram Rajagopalan
2014-10-20  3:09     ` Wen Congyang
2014-10-14 15:48 ` [PATCH 00/17] blktap2 related bugfix patches Ian Jackson
2014-10-15  1:05   ` Wen Congyang
2014-10-19 20:34     ` Shriram Rajagopalan
2014-10-20 14:25     ` George Dunlap
2014-10-21  2:28       ` Wen Congyang
2014-10-21  2:56       ` Wen Congyang
2014-10-21  9:55         ` George Dunlap
2014-10-21 10:07           ` M A Young
2014-10-21 10:45           ` Bob Ball
2014-10-29  5:49       ` Wen Congyang
2014-11-03  9:58         ` George Dunlap
2014-11-03 10:07           ` Wen Congyang
2014-11-05 19:25             ` Konrad Rzeszutek Wilk
2015-02-13  6:56           ` Hongyang Yang
2015-02-14 18:40             ` George Dunlap
2014-10-27 18:32 ` Konrad Rzeszutek Wilk

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=1413252845-23433-11-git-send-email-wency@cn.fujitsu.com \
    --to=wency@cn.fujitsu.com \
    --cc=Ian.Campbell@citrix.com \
    --cc=Ian.Jackson@eu.citrix.com \
    --cc=eddie.dong@intel.com \
    --cc=laijs@cn.fujitsu.com \
    --cc=rshriram@cs.ubc.ca \
    --cc=xen-devel@lists.xen.org \
    --cc=yanghy@cn.fujitsu.com \
    --cc=yunhong.jiang@intel.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).