Commit 8d9648cb authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Kevin Wolf
Browse files

blockjob: fix user pause in block_job_error_action 



Job (especially mirror) may call block_job_error_action several
times before actual pause if it has several in-flight requests.

block_job_error_action will call job_pause more than once in this case,
which lead to following block-job-resume qmp command can't actually
resume the job.

Fix it by do not increase pause level in block_job_error_action if
user_paused already set.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 27e42789

blockjob.c

+5 −3
Original line number Diff line number Diff line
@@ -501,9 +501,11 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockdevOnError on_err, 
                                        action);

    }

    if (action == BLOCK_ERROR_ACTION_STOP) {

        if (!job->job.user_paused) {

            job_pause(&job->job);

            /* make the pause user visible, which will be resumed from QMP. */

            job->job.user_paused = true;

        }

        block_job_iostatus_set_err(job, error);

    }

    return action;