| Message ID | 1436258596-1253-3-git-send-email-wency@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On Tue 07 Jul 2015 10:43:00 AM CEST, Wen Congyang wrote: > Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> > Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> > Signed-off-by: Gonglei <arei.gonglei@huawei.com> > Cc: Alberto Garcia <berto@igalia.com> Sorry for being so late with this, I was on holidays during July. > +static void quorum_del_child(BlockDriverState *bs, BlockDriverState *child_bs, > + Error **errp) > +{ > + BDRVQuorumState *s = bs->opaque; > + int i; > + > + for (i = 0; i < s->num_children; i++) { > + if (s->bs[i] == child_bs) { > + break; > + } > + } > + > + if (i == s->num_children) { > + error_setg(errp, "Invalid child"); > + return; > + } > + > + if (s->num_children <= s->threshold) { > + error_setg(errp, "Cannot remove any more child"); > + return; > + } I think that should be "Cannot remove any more children". You could also make it a bit more explanatory by saying "The number of children cannot be lower than the vote threshold" or something like that. > + bdrv_drain(bs); > + /* We can safe remove this child now */ > + memmove(&s->bs[i], &s->bs[i+1], (s->num_children - i - 1) * sizeof(void *)); s/safe/safely/ Apart from that, the code looks good to me, so Reviewed-by: Alberto Garcia <berto@igalia.com> Berto
On 08/05/2015 08:19 PM, Alberto Garcia wrote: > On Tue 07 Jul 2015 10:43:00 AM CEST, Wen Congyang wrote: >> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> >> Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> >> Signed-off-by: Gonglei <arei.gonglei@huawei.com> >> Cc: Alberto Garcia <berto@igalia.com> > > Sorry for being so late with this, I was on holidays during July. > >> +static void quorum_del_child(BlockDriverState *bs, BlockDriverState *child_bs, >> + Error **errp) >> +{ >> + BDRVQuorumState *s = bs->opaque; >> + int i; >> + >> + for (i = 0; i < s->num_children; i++) { >> + if (s->bs[i] == child_bs) { >> + break; >> + } >> + } >> + >> + if (i == s->num_children) { >> + error_setg(errp, "Invalid child"); >> + return; >> + } >> + >> + if (s->num_children <= s->threshold) { >> + error_setg(errp, "Cannot remove any more child"); >> + return; >> + } > > I think that should be "Cannot remove any more children". > > You could also make it a bit more explanatory by saying "The number of > children cannot be lower than the vote threshold" or something like > that. > >> + bdrv_drain(bs); >> + /* We can safe remove this child now */ >> + memmove(&s->bs[i], &s->bs[i+1], (s->num_children - i - 1) * sizeof(void *)); > > s/safe/safely/ > > Apart from that, the code looks good to me, so > > Reviewed-by: Alberto Garcia <berto@igalia.com> Thanks, I have send add/delete a quorum child separately. This patch is changed one line: unref child_bs when it is removed. I will update that patch and add your reviewed-by in that patchset. Thanks Wen Congyang > > Berto > . >
diff --git a/block/quorum.c b/block/quorum.c index b0eead0..76b29b1 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -67,6 +67,9 @@ typedef struct QuorumVotes { typedef struct BDRVQuorumState { BlockDriverState **bs; /* children BlockDriverStates */ int num_children; /* children count */ + int max_children; /* The maximum children count, we need to reallocate + * bs if num_children will larger than maximum. + */ int threshold; /* if less than threshold children reads gave the * same result a quorum error occurs. */ @@ -879,9 +882,9 @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags, ret = -EINVAL; goto exit; } - if (s->num_children < 2) { + if (s->num_children < 1) { error_setg(&local_err, - "Number of provided children must be greater than 1"); + "Number of provided children must be 1 or more"); ret = -EINVAL; goto exit; } @@ -930,6 +933,7 @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags, /* allocate the children BlockDriverState array */ s->bs = g_new0(BlockDriverState *, s->num_children); opened = g_new0(bool, s->num_children); + s->max_children = s->num_children; for (i = 0; i < s->num_children; i++) { char indexstr[32]; @@ -1000,6 +1004,68 @@ static void quorum_attach_aio_context(BlockDriverState *bs, } } +static void quorum_add_child(BlockDriverState *bs, QDict *options, Error **errp) +{ + BDRVQuorumState *s = bs->opaque; + int ret; + Error *local_err = NULL; + + bdrv_drain(bs); + + if (s->num_children == s->max_children) { + if (s->max_children >= INT_MAX) { + error_setg(errp, "Too many children"); + return; + } + + s->bs = g_renew(BlockDriverState *, s->bs, s->max_children + 1); + s->bs[s->num_children] = NULL; + s->max_children += 1; + } + + ret = bdrv_open_image(&s->bs[s->num_children], NULL, options, "child", bs, + &child_format, false, &local_err); + if (ret < 0) { + error_propagate(errp, local_err); + return; + } + s->num_children++; +} + +static void quorum_del_child(BlockDriverState *bs, BlockDriverState *child_bs, + Error **errp) +{ + BDRVQuorumState *s = bs->opaque; + int i; + + for (i = 0; i < s->num_children; i++) { + if (s->bs[i] == child_bs) { + break; + } + } + + if (i == s->num_children) { + error_setg(errp, "Invalid child"); + return; + } + + if (s->num_children <= s->threshold) { + error_setg(errp, "Cannot remove any more child"); + return; + } + + if (s->num_children == 1) { + error_setg(errp, "Cannot remove the last child"); + return; + } + + bdrv_drain(bs); + /* We can safe remove this child now */ + memmove(&s->bs[i], &s->bs[i+1], (s->num_children - i - 1) * sizeof(void *)); + s->num_children--; + s->bs[s->num_children] = NULL; +} + static void quorum_refresh_filename(BlockDriverState *bs) { BDRVQuorumState *s = bs->opaque; @@ -1054,6 +1120,9 @@ static BlockDriver bdrv_quorum = { .bdrv_detach_aio_context = quorum_detach_aio_context, .bdrv_attach_aio_context = quorum_attach_aio_context, + .bdrv_add_child = quorum_add_child, + .bdrv_del_child = quorum_del_child, + .is_filter = true, .bdrv_recurse_is_first_non_filter = quorum_recurse_is_first_non_filter, };