Commit e321c059 authored by Jeff Cody's avatar Jeff Cody
Browse files

block: for jobs, do not clear user_paused until after the resume 



The function job_cancel_async() will always cause an assert for blockjob
user resume.  We set job->user_paused to false, and then call
job->driver->user_resume().  In the case of blockjobs, this is the
block_job_user_resume() function.

In that function, we assert that job.user_paused is set to true.
Unfortunately, right before calling this function, it has explicitly
been set to false.

The fix is pretty simple: set job->user_paused to false only after the
job user_resume() function has been called.

Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
Message-id: bb183b77d8f2dd6bd67b8da559a90ac1e74b2052.1534868459.git.jcody@redhat.com
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
parent ee135aa0

job.c

+1 −1
Original line number Diff line number Diff line
@@ -732,10 +732,10 @@ static void job_cancel_async(Job *job, bool force) 
{

    if (job->user_paused) {

        /* Do not call job_enter here, the caller will handle it.  */

        job->user_paused = false;

        if (job->driver->user_resume) {

            job->driver->user_resume(job);

        }

        job->user_paused = false;

        assert(job->pause_count > 0);

        job->pause_count--;

    }