Commit 6049490d authored by Alberto Garcia's avatar Alberto Garcia Committed by Max Reitz
Browse files

quorum: Emit QUORUM_REPORT_BAD for reads in fifo mode 



If there's an I/O error in one of Quorum children then QEMU
should emit QUORUM_REPORT_BAD. However this is not working with
read-pattern=fifo. This patch fixes this problem.

Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Message-id: d57e39e8d3e8564003a1e2aadbd29c97286eb2d2.1458034554.git.berto@igalia.com
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 8896e088

block/quorum.c

+9 −8
Original line number Diff line number Diff line
@@ -284,9 +284,17 @@ static void quorum_aio_cb(void *opaque, int ret) 
    QuorumChildRequest *sacb = opaque;

    QuorumAIOCB *acb = sacb->parent;

    BDRVQuorumState *s = acb->common.bs->opaque;

    QuorumOpType type;

    bool rewrite = false;



    if (ret == 0) {

        acb->success_count++;

    } else {

        QuorumOpType type;

        type = acb->is_read ? QUORUM_OP_TYPE_READ : QUORUM_OP_TYPE_WRITE;

        quorum_report_bad(type, acb->sector_num, acb->nb_sectors,

                          sacb->aiocb->bs->node_name, ret);

    }



    if (acb->is_read && s->read_pattern == QUORUM_READ_PATTERN_FIFO) {

        /* We try to read next child in FIFO order if we fail to read */

        if (ret < 0 && (acb->child_iter + 1) < s->num_children) {
@@ -303,15 +311,8 @@ static void quorum_aio_cb(void *opaque, int ret) 
        return;

    }



    type = acb->is_read ? QUORUM_OP_TYPE_READ : QUORUM_OP_TYPE_WRITE;

    sacb->ret = ret;

    acb->count++;

    if (ret == 0) {

        acb->success_count++;

    } else {

        quorum_report_bad(type, acb->sector_num, acb->nb_sectors,

                          sacb->aiocb->bs->node_name, ret);

    }

    assert(acb->count <= s->num_children);

    assert(acb->success_count <= s->num_children);

    if (acb->count < s->num_children) {