| Message ID | 1460046661-8441-1-git-send-email-olaf@aepfle.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/04/16 17:31, Olaf Hering wrote: > Doing a 'xl migrate --debug domU host' on xen-4.5 adds a > XC_SAVE_ID_ENABLE_VERIFY_MODE marker, which is not handled. > Since using --debug is valid usage, handle it by logging the fact > instead of aborting the migration. > > Signed-off-by: Olaf Hering <olaf@aepfle.de> > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > Cc: Wei Liu <wei.liu2@citrix.com> Hmm - I had never considered someone doing that. Debug mode for legacy migration was sufficiently broken (in a falling over wild pointers kind of way) that I assumed noone ever used it. But yes - not needlessly killing the migration is an improvement. Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> Ian: This is also a backport candidate for 4.6 > --- > tools/python/scripts/convert-legacy-stream | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/tools/python/scripts/convert-legacy-stream b/tools/python/scripts/convert-legacy-stream > index 41fee10..5f80f13 100755 > --- a/tools/python/scripts/convert-legacy-stream > +++ b/tools/python/scripts/convert-legacy-stream > @@ -389,8 +389,7 @@ def read_chunks(vm): > write_page_data(pfns, pages) > > elif marker == legacy.CHUNK_enable_verify_mode: > - # For debugging purposes only. Will not be seen in real migration > - raise RuntimeError("Unable to convert a debug stream") > + info("This is a debug stream") > > elif marker == legacy.CHUNK_vcpu_info: > max_id, = unpack_exact("i")
On Thu, Apr 07, 2016 at 06:31:01PM +0200, Olaf Hering wrote: > Doing a 'xl migrate --debug domU host' on xen-4.5 adds a > XC_SAVE_ID_ENABLE_VERIFY_MODE marker, which is not handled. > Since using --debug is valid usage, handle it by logging the fact > instead of aborting the migration. > > Signed-off-by: Olaf Hering <olaf@aepfle.de> > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > Cc: Wei Liu <wei.liu2@citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com> > --- > tools/python/scripts/convert-legacy-stream | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/tools/python/scripts/convert-legacy-stream b/tools/python/scripts/convert-legacy-stream > index 41fee10..5f80f13 100755 > --- a/tools/python/scripts/convert-legacy-stream > +++ b/tools/python/scripts/convert-legacy-stream > @@ -389,8 +389,7 @@ def read_chunks(vm): > write_page_data(pfns, pages) > > elif marker == legacy.CHUNK_enable_verify_mode: > - # For debugging purposes only. Will not be seen in real migration > - raise RuntimeError("Unable to convert a debug stream") > + info("This is a debug stream") > > elif marker == legacy.CHUNK_vcpu_info: > max_id, = unpack_exact("i")
Wei Liu writes ("Re: [PATCH] tools: handle xl migrate --debug in legacy stream"):
> On Thu, Apr 07, 2016 at 06:31:01PM +0200, Olaf Hering wrote:
> > Doing a 'xl migrate --debug domU host' on xen-4.5 adds a
> > XC_SAVE_ID_ENABLE_VERIFY_MODE marker, which is not handled.
> > Since using --debug is valid usage, handle it by logging the fact
> > instead of aborting the migration.
> >
> > Signed-off-by: Olaf Hering <olaf@aepfle.de>
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > Cc: Wei Liu <wei.liu2@citrix.com>
>
> Acked-by: Wei Liu <wei.liu2@citrix.com>
Thanks, and thanks to Andrew for the review. Queued for 4.7.
Ian.
Andrew Cooper writes ("Re: [PATCH] tools: handle xl migrate --debug in legacy stream"):
> On 07/04/16 17:31, Olaf Hering wrote:
> > Doing a 'xl migrate --debug domU host' on xen-4.5 adds a
> > XC_SAVE_ID_ENABLE_VERIFY_MODE marker, which is not handled.
> > Since using --debug is valid usage, handle it by logging the fact
> > instead of aborting the migration.
> >
> > Signed-off-by: Olaf Hering <olaf@aepfle.de>
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > Cc: Wei Liu <wei.liu2@citrix.com>
>
> Hmm - I had never considered someone doing that. Debug mode for legacy
> migration was sufficiently broken (in a falling over wild pointers kind
> of way) that I assumed noone ever used it.
>
> But yes - not needlessly killing the migration is an improvement.
>
> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
>
> Ian: This is also a backport candidate for 4.6
Queued for backport.
Ian.
Ian Jackson writes ("Re: [PATCH] tools: handle xl migrate --debug in legacy stream"):
> Andrew Cooper writes ("Re: [PATCH] tools: handle xl migrate --debug in legacy stream"):
> > Ian: This is also a backport candidate for 4.6
>
> Queued for backport.
Pushed to 4.6.
Ian.
diff --git a/tools/python/scripts/convert-legacy-stream b/tools/python/scripts/convert-legacy-stream index 41fee10..5f80f13 100755 --- a/tools/python/scripts/convert-legacy-stream +++ b/tools/python/scripts/convert-legacy-stream @@ -389,8 +389,7 @@ def read_chunks(vm): write_page_data(pfns, pages) elif marker == legacy.CHUNK_enable_verify_mode: - # For debugging purposes only. Will not be seen in real migration - raise RuntimeError("Unable to convert a debug stream") + info("This is a debug stream") elif marker == legacy.CHUNK_vcpu_info: max_id, = unpack_exact("i")
Doing a 'xl migrate --debug domU host' on xen-4.5 adds a XC_SAVE_ID_ENABLE_VERIFY_MODE marker, which is not handled. Since using --debug is valid usage, handle it by logging the fact instead of aborting the migration. Signed-off-by: Olaf Hering <olaf@aepfle.de> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> --- tools/python/scripts/convert-legacy-stream | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)