Commit 6fd2e407 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by John Snow
Browse files

qapi: add transaction support for x-block-dirty-bitmap-merge 



New action is like clean action: do the whole thing in .prepare and
undo in .abort. This behavior for bitmap-changing actions is needed
because backup job actions use bitmap in .prepare.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
parent 5c4cf8b2

blockdev.c

+35 −0
Original line number Diff line number Diff line
@@ -2113,6 +2113,35 @@ static void block_dirty_bitmap_disable_abort(BlkActionState *common) 
    }

}



static void block_dirty_bitmap_merge_prepare(BlkActionState *common,

                                             Error **errp)

{

    BlockDirtyBitmapMerge *action;

    BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,

                                             common, common);

    BdrvDirtyBitmap *merge_source;



    if (action_check_completion_mode(common, errp) < 0) {

        return;

    }



    action = common->action->u.x_block_dirty_bitmap_merge.data;

    state->bitmap = block_dirty_bitmap_lookup(action->node,

                                              action->dst_name,

                                              &state->bs,

                                              errp);

    if (!state->bitmap) {

        return;

    }



    merge_source = bdrv_find_dirty_bitmap(state->bs, action->src_name);

    if (!merge_source) {

        return;

    }



    bdrv_merge_dirty_bitmap(state->bitmap, merge_source, &state->backup, errp);

}



static void abort_prepare(BlkActionState *common, Error **errp)

{

    error_setg(errp, "Transaction aborted using Abort action");
@@ -2184,6 +2213,12 @@ static const BlkActionOps actions[] = { 
        .prepare = block_dirty_bitmap_disable_prepare,

        .abort = block_dirty_bitmap_disable_abort,

    },

    [TRANSACTION_ACTION_KIND_X_BLOCK_DIRTY_BITMAP_MERGE] = {

        .instance_size = sizeof(BlockDirtyBitmapState),

        .prepare = block_dirty_bitmap_merge_prepare,

        .commit = block_dirty_bitmap_free_backup,

        .abort = block_dirty_bitmap_restore,

    },

    /* Where are transactions for MIRROR, COMMIT and STREAM?

     * Although these blockjobs use transaction callbacks like the backup job,

     * these jobs do not necessarily adhere to transaction semantics.

qapi/transaction.json

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
# - @block-dirty-bitmap-clear: since 2.5

# - @x-block-dirty-bitmap-enable: since 3.0

# - @x-block-dirty-bitmap-disable: since 3.0

# - @x-block-dirty-bitmap-merge: since 3.1

# - @blockdev-backup: since 2.3

# - @blockdev-snapshot: since 2.5

# - @blockdev-snapshot-internal-sync: since 1.7
@@ -63,6 +64,7 @@ 
       'block-dirty-bitmap-clear': 'BlockDirtyBitmap',

       'x-block-dirty-bitmap-enable': 'BlockDirtyBitmap',

       'x-block-dirty-bitmap-disable': 'BlockDirtyBitmap',

       'x-block-dirty-bitmap-merge': 'BlockDirtyBitmapMerge',

       'blockdev-backup': 'BlockdevBackup',

       'blockdev-snapshot': 'BlockdevSnapshot',

       'blockdev-snapshot-internal-sync': 'BlockdevSnapshotInternal',