aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorWen Congyang <wency@cn.fujitsu.com>2015-07-17 10:12:22 +0800
committerStefan Hajnoczi <stefanha@redhat.com>2015-09-02 14:56:39 +0100
commite12f3784097a26a1ba51be420f41038b4c0ae5d1 (patch)
tree14f552aa3fac589c508d646f93243a942698c7fb /block
parentf307371217c42d62015b8d83300a11cd9d3966f3 (diff)
block: more check for replaced node
We use mirror+replace to fix quorum's broken child. bs/s->common.bs is quorum, and to_replace is the broken child. The new child is target_bs. Without this patch, the replace node can be any node, and it can be top BDS with BB, or another quorum's child. We just check if the broken child is part of the quorum BDS in this patch. Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> Message-id: 55A86486.1000404@cn.fujitsu.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/mirror.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/mirror.c b/block/mirror.c
index 94744432eb..a2589261f5 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -644,9 +644,9 @@ static void mirror_complete(BlockJob *job, Error **errp)
if (s->replaces) {
AioContext *replace_aio_context;
- s->to_replace = check_to_replace_node(s->replaces, &local_err);
+ s->to_replace = bdrv_find_node(s->replaces);
if (!s->to_replace) {
- error_propagate(errp, local_err);
+ error_setg(errp, "Node name '%s' not found", s->replaces);
return;
}