Commit 08ddb4eb authored by Lukas Straub's avatar Lukas Straub Committed by Jason Wang
Browse files

block/replication.c: Ignore requests after failover 



After failover the Secondary side of replication shouldn't change state, because
it now functions as our primary disk.

In replication_start, replication_do_checkpoint, replication_stop, ignore
the request if current state is BLOCK_REPLICATION_DONE (sucessful failover) or
BLOCK_REPLICATION_FAILOVER (failover in progres i.e. currently merging active
and hidden images into the base image).

Signed-off-by: default avatarLukas Straub <lukasstraub2@web.de>
Reviewed-by: default avatarZhang Chen <chen.zhang@intel.com>
Acked-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent dda8f185

block/replication.c

+34 −1
Original line number Diff line number Diff line
@@ -450,6 +450,17 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode, 
    aio_context_acquire(aio_context);

    s = bs->opaque;



    if (s->stage == BLOCK_REPLICATION_DONE ||

        s->stage == BLOCK_REPLICATION_FAILOVER) {

        /*

         * This case happens when a secondary is promoted to primary.

         * Ignore the request because the secondary side of replication

         * doesn't have to do anything anymore.

         */

        aio_context_release(aio_context);

        return;

    }



    if (s->stage != BLOCK_REPLICATION_NONE) {

        error_setg(errp, "Block replication is running or done");

        aio_context_release(aio_context);
@@ -574,6 +585,17 @@ static void replication_do_checkpoint(ReplicationState *rs, Error **errp) 
    aio_context_acquire(aio_context);

    s = bs->opaque;



    if (s->stage == BLOCK_REPLICATION_DONE ||

        s->stage == BLOCK_REPLICATION_FAILOVER) {

        /*

         * This case happens when a secondary was promoted to primary.

         * Ignore the request because the secondary side of replication

         * doesn't have to do anything anymore.

         */

        aio_context_release(aio_context);

        return;

    }



    if (s->mode == REPLICATION_MODE_SECONDARY) {

        secondary_do_checkpoint(s, errp);

    }
@@ -590,7 +612,7 @@ static void replication_get_error(ReplicationState *rs, Error **errp) 
    aio_context_acquire(aio_context);

    s = bs->opaque;



    if (s->stage != BLOCK_REPLICATION_RUNNING) {

    if (s->stage == BLOCK_REPLICATION_NONE) {

        error_setg(errp, "Block replication is not running");

        aio_context_release(aio_context);

        return;
@@ -632,6 +654,17 @@ static void replication_stop(ReplicationState *rs, bool failover, Error **errp) 
    aio_context_acquire(aio_context);

    s = bs->opaque;



    if (s->stage == BLOCK_REPLICATION_DONE ||

        s->stage == BLOCK_REPLICATION_FAILOVER) {

        /*

         * This case happens when a secondary was promoted to primary.

         * Ignore the request because the secondary side of replication

         * doesn't have to do anything anymore.

         */

        aio_context_release(aio_context);

        return;

    }



    if (s->stage != BLOCK_REPLICATION_RUNNING) {

        error_setg(errp, "Block replication is not running");

        aio_context_release(aio_context);