* [Qemu-devel] [PATCH for-2.4] block: keep bitmap if incremental backup job is cancelled
@ 2015-06-25 12:53 Stefan Hajnoczi
2015-06-25 16:30 ` John Snow
0 siblings, 1 reply; 5+ messages in thread
From: Stefan Hajnoczi @ 2015-06-25 12:53 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-block, Jeff Cody, qemu-stable, mreitz, Stefan Hajnoczi,
John Snow
Reclaim the dirty bitmap if an incremental backup block job is
cancelled. The ret variable may be 0 when the job is cancelled so it's
not enough to check ret < 0.
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
block/backup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/backup.c b/block/backup.c
index 4a1af68..ddf8424 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -431,7 +431,7 @@ static void coroutine_fn backup_run(void *opaque)
if (job->sync_bitmap) {
BdrvDirtyBitmap *bm;
- if (ret < 0) {
+ if (ret < 0 || block_job_is_cancelled(&job->common)) {
/* Merge the successor back into the parent, delete nothing. */
bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL);
assert(bm);
--
2.4.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH for-2.4] block: keep bitmap if incremental backup job is cancelled
2015-06-25 12:53 [Qemu-devel] [PATCH for-2.4] block: keep bitmap if incremental backup job is cancelled Stefan Hajnoczi
@ 2015-06-25 16:30 ` John Snow
2015-06-25 16:33 ` Jeff Cody
0 siblings, 1 reply; 5+ messages in thread
From: John Snow @ 2015-06-25 16:30 UTC (permalink / raw)
To: Stefan Hajnoczi, qemu-devel; +Cc: Jeff Cody, qemu-stable, qemu-block, mreitz
On 06/25/2015 08:53 AM, Stefan Hajnoczi wrote:
> Reclaim the dirty bitmap if an incremental backup block job is
> cancelled. The ret variable may be 0 when the job is cancelled so it's
> not enough to check ret < 0.
>
> Reviewed-by: John Snow <jsnow@redhat.com>
> Reviewed-by: Max Reitz <mreitz@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
> block/backup.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/block/backup.c b/block/backup.c
> index 4a1af68..ddf8424 100644
> --- a/block/backup.c
> +++ b/block/backup.c
> @@ -431,7 +431,7 @@ static void coroutine_fn backup_run(void *opaque)
>
> if (job->sync_bitmap) {
> BdrvDirtyBitmap *bm;
> - if (ret < 0) {
> + if (ret < 0 || block_job_is_cancelled(&job->common)) {
> /* Merge the successor back into the parent, delete nothing. */
> bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL);
> assert(bm);
>
Didn't Jeff Cody already stage this?
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH for-2.4] block: keep bitmap if incremental backup job is cancelled
2015-06-25 16:30 ` John Snow
@ 2015-06-25 16:33 ` Jeff Cody
2015-06-26 9:57 ` [Qemu-devel] [Qemu-block] " Stefan Hajnoczi
0 siblings, 1 reply; 5+ messages in thread
From: Jeff Cody @ 2015-06-25 16:33 UTC (permalink / raw)
To: John Snow; +Cc: mreitz, qemu-block, qemu-devel, Stefan Hajnoczi, qemu-stable
On Thu, Jun 25, 2015 at 12:30:56PM -0400, John Snow wrote:
>
>
> On 06/25/2015 08:53 AM, Stefan Hajnoczi wrote:
> > Reclaim the dirty bitmap if an incremental backup block job is
> > cancelled. The ret variable may be 0 when the job is cancelled so it's
> > not enough to check ret < 0.
> >
> > Reviewed-by: John Snow <jsnow@redhat.com>
> > Reviewed-by: Max Reitz <mreitz@redhat.com>
> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> > ---
> > block/backup.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/block/backup.c b/block/backup.c
> > index 4a1af68..ddf8424 100644
> > --- a/block/backup.c
> > +++ b/block/backup.c
> > @@ -431,7 +431,7 @@ static void coroutine_fn backup_run(void *opaque)
> >
> > if (job->sync_bitmap) {
> > BdrvDirtyBitmap *bm;
> > - if (ret < 0) {
> > + if (ret < 0 || block_job_is_cancelled(&job->common)) {
> > /* Merge the successor back into the parent, delete nothing. */
> > bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL);
> > assert(bm);
> >
>
> Didn't Jeff Cody already stage this?
Yes
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [Qemu-block] [PATCH for-2.4] block: keep bitmap if incremental backup job is cancelled
2015-06-25 16:33 ` Jeff Cody
@ 2015-06-26 9:57 ` Stefan Hajnoczi
2015-06-26 13:04 ` Max Reitz
0 siblings, 1 reply; 5+ messages in thread
From: Stefan Hajnoczi @ 2015-06-26 9:57 UTC (permalink / raw)
To: Jeff Cody
Cc: qemu-block, qemu-stable, qemu-devel, Stefan Hajnoczi, mreitz,
John Snow
[-- Attachment #1: Type: text/plain, Size: 1321 bytes --]
On Thu, Jun 25, 2015 at 12:33:25PM -0400, Jeff Cody wrote:
> On Thu, Jun 25, 2015 at 12:30:56PM -0400, John Snow wrote:
> >
> >
> > On 06/25/2015 08:53 AM, Stefan Hajnoczi wrote:
> > > Reclaim the dirty bitmap if an incremental backup block job is
> > > cancelled. The ret variable may be 0 when the job is cancelled so it's
> > > not enough to check ret < 0.
> > >
> > > Reviewed-by: John Snow <jsnow@redhat.com>
> > > Reviewed-by: Max Reitz <mreitz@redhat.com>
> > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> > > ---
> > > block/backup.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/block/backup.c b/block/backup.c
> > > index 4a1af68..ddf8424 100644
> > > --- a/block/backup.c
> > > +++ b/block/backup.c
> > > @@ -431,7 +431,7 @@ static void coroutine_fn backup_run(void *opaque)
> > >
> > > if (job->sync_bitmap) {
> > > BdrvDirtyBitmap *bm;
> > > - if (ret < 0) {
> > > + if (ret < 0 || block_job_is_cancelled(&job->common)) {
> > > /* Merge the successor back into the parent, delete nothing. */
> > > bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL);
> > > assert(bm);
> > >
> >
> > Didn't Jeff Cody already stage this?
>
> Yes
Thanks!
[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [Qemu-block] [PATCH for-2.4] block: keep bitmap if incremental backup job is cancelled
2015-06-26 9:57 ` [Qemu-devel] [Qemu-block] " Stefan Hajnoczi
@ 2015-06-26 13:04 ` Max Reitz
0 siblings, 0 replies; 5+ messages in thread
From: Max Reitz @ 2015-06-26 13:04 UTC (permalink / raw)
To: Stefan Hajnoczi, Jeff Cody
Cc: Stefan Hajnoczi, John Snow, qemu-devel, qemu-block, qemu-stable
On 26.06.2015 11:57, Stefan Hajnoczi wrote:
> On Thu, Jun 25, 2015 at 12:33:25PM -0400, Jeff Cody wrote:
>> On Thu, Jun 25, 2015 at 12:30:56PM -0400, John Snow wrote:
>>>
>>> On 06/25/2015 08:53 AM, Stefan Hajnoczi wrote:
>>>> Reclaim the dirty bitmap if an incremental backup block job is
>>>> cancelled. The ret variable may be 0 when the job is cancelled so it's
>>>> not enough to check ret < 0.
>>>>
>>>> Reviewed-by: John Snow <jsnow@redhat.com>
>>>> Reviewed-by: Max Reitz <mreitz@redhat.com>
>>>> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
>>>> ---
>>>> block/backup.c | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/block/backup.c b/block/backup.c
>>>> index 4a1af68..ddf8424 100644
>>>> --- a/block/backup.c
>>>> +++ b/block/backup.c
>>>> @@ -431,7 +431,7 @@ static void coroutine_fn backup_run(void *opaque)
>>>>
>>>> if (job->sync_bitmap) {
>>>> BdrvDirtyBitmap *bm;
>>>> - if (ret < 0) {
>>>> + if (ret < 0 || block_job_is_cancelled(&job->common)) {
>>>> /* Merge the successor back into the parent, delete nothing. */
>>>> bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL);
>>>> assert(bm);
>>>>
>>> Didn't Jeff Cody already stage this?
>> Yes
> Thanks!
It appears like I successfully confused Stefan, thanks to John not
wanting to embarrass me in public. :-)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-06-26 13:04 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-25 12:53 [Qemu-devel] [PATCH for-2.4] block: keep bitmap if incremental backup job is cancelled Stefan Hajnoczi
2015-06-25 16:30 ` John Snow
2015-06-25 16:33 ` Jeff Cody
2015-06-26 9:57 ` [Qemu-devel] [Qemu-block] " Stefan Hajnoczi
2015-06-26 13:04 ` Max Reitz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).