Commit 834cb2ad authored by Wen Congyang's avatar Wen Congyang Committed by Max Reitz
Browse files

quorum: validate vote threshold against num_children even if read-pattern is fifo 



We need to use threshold to check if too many write operation fails.
If threshold is larger than num children, we always get write error
event even if all write operations success.

Signed-off-by: default avatarWen Congyang <wency@cn.fujitsu.com>
Message-id: 55962F72.3060003@cn.fujitsu.com
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 909c260c

block/quorum.c

+6 −6
Original line number Diff line number Diff line
@@ -889,20 +889,20 @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags, 
    }



    s->threshold = qemu_opt_get_number(opts, QUORUM_OPT_VOTE_THRESHOLD, 0);

    ret = parse_read_pattern(qemu_opt_get(opts, QUORUM_OPT_READ_PATTERN));

    /* and validate it against s->num_children */

    ret = quorum_valid_threshold(s->threshold, s->num_children, &local_err);

    if (ret < 0) {

        error_setg(&local_err, "Please set read-pattern as fifo or quorum");

        goto exit;

    }

    s->read_pattern = ret;



    if (s->read_pattern == QUORUM_READ_PATTERN_QUORUM) {

        /* and validate it against s->num_children */

        ret = quorum_valid_threshold(s->threshold, s->num_children, &local_err);

    ret = parse_read_pattern(qemu_opt_get(opts, QUORUM_OPT_READ_PATTERN));

    if (ret < 0) {

        error_setg(&local_err, "Please set read-pattern as fifo or quorum");

        goto exit;

    }

    s->read_pattern = ret;



    if (s->read_pattern == QUORUM_READ_PATTERN_QUORUM) {

        /* is the driver in blkverify mode */

        if (qemu_opt_get_bool(opts, QUORUM_OPT_BLKVERIFY, false) &&

            s->num_children == 2 && s->threshold == 2) {