Skip to content
Snippets Groups Projects
  • Hanna Reitz's avatar
    a640fa0e
    mirror: Do not clear .cancelled · a640fa0e
    Hanna Reitz authored
    
    Clearing .cancelled before leaving the main loop when the job has been
    soft-cancelled is no longer necessary since job_is_cancelled() only
    returns true for jobs that have been force-cancelled.
    
    Therefore, this only makes a differences in places that call
    job_cancel_requested().  In block/mirror.c, this is done only before
    .cancelled was cleared.
    
    In job.c, there are two callers:
    - job_completed_txn_abort() asserts that .cancelled is true, so keeping
      it true will not affect this place.
    
    - job_complete() refuses to let a job complete that has .cancelled set.
      It is correct to refuse to let the user invoke job-complete on mirror
      jobs that have already been soft-cancelled.
    
    With this change, there are no places that reset .cancelled to false and
    so we can be sure that .force_cancel can only be true if .cancelled is
    true as well.  Assert this in job_is_cancelled().
    
    Signed-off-by: default avatarHanna Reitz <hreitz@redhat.com>
    Reviewed-by: default avatarEric Blake <eblake@redhat.com>
    Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
    Message-Id: <20211006151940.214590-13-hreitz@redhat.com>
    Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
    a640fa0e
    History
    mirror: Do not clear .cancelled
    Hanna Reitz authored
    
    Clearing .cancelled before leaving the main loop when the job has been
    soft-cancelled is no longer necessary since job_is_cancelled() only
    returns true for jobs that have been force-cancelled.
    
    Therefore, this only makes a differences in places that call
    job_cancel_requested().  In block/mirror.c, this is done only before
    .cancelled was cleared.
    
    In job.c, there are two callers:
    - job_completed_txn_abort() asserts that .cancelled is true, so keeping
      it true will not affect this place.
    
    - job_complete() refuses to let a job complete that has .cancelled set.
      It is correct to refuse to let the user invoke job-complete on mirror
      jobs that have already been soft-cancelled.
    
    With this change, there are no places that reset .cancelled to false and
    so we can be sure that .force_cancel can only be true if .cancelled is
    true as well.  Assert this in job_is_cancelled().
    
    Signed-off-by: default avatarHanna Reitz <hreitz@redhat.com>
    Reviewed-by: default avatarEric Blake <eblake@redhat.com>
    Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
    Message-Id: <20211006151940.214590-13-hreitz@redhat.com>
    Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>