xl: Allow shutdown wait for domain death
PATCH 1/1 xl: Allow shutdown wait for domain death
xl shutdown -w waits for the first of either domain shutdown or death. Shutdown is the halting of the guest operating system, and death is the freeing of domain resources.
Allow specifying -w multiple times to wait for only domain death. This is useful in scripts so that all resources are free before the script continues.
--- docs/man/xl.1.pod.in | 4 +++- tools/xl/xl_vmcontrol.c | 17 +++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-)
docs/man/xl.1.pod.in +3 -1
@@ -743,7 +743,9 @@ of a Xen system. =item B<-w>, B<--wait> -Wait for the domain to complete shutdown before returning. +Wait for the domain to complete shutdown before returning. If given once, +the wait is for domain shutdown or domain death. If given multiple times, +the wait is for domain death only. =item B<-F>
tools/xl/xl_vmcontrol.c +11 -6
@@ -162,7 +162,8 @@ static void shutdown_domain(uint32_t domid, } } -static void wait_for_domain_deaths (libxl_evgen_domain_death **deathws,int nr) +static void wait_for_domain_deaths (libxl_evgen_domain_death **deathws,int nr, +int wait_for_shutdown_or_death) {int rc, count =0 ;LOG ("Waiting for %d domains" , nr);
@@ -183,8 +184,12 @@ static void wait_for_domain_deaths(libxl_evgen_domain_death **deathws, int nr)case LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN :LOG ("Domain %d has been shut down, reason code %d" , event->domid, event->u.domain_shutdown.shutdown_reason); -libxl_evdisable_domain_death (ctx, deathws[event->for_user]); - count++; +if (wait_for_shutdown_or_death) { +libxl_evdisable_domain_death (ctx, deathws[event->for_user]); + count++; + }else { +LOG ("Domain %d continue waiting for death" , event->domid); + }break ;default :LOG ("Unexpected event type %d" , event->type);
@@ -214,7 +219,7 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv) all =1 ;break ;case 'w' : - wait_for_it =1 ; + wait_for_it++;break ;case 'F' : fallback_trigger =1 ;
@@ -246,7 +251,7 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv) }if (deathws) { -wait_for_domain_deaths (deathws, nrdeathws); +wait_for_domain_deaths (deathws, nrdeathws, wait_for_it ==1 );free (deathws); }
@@ -258,7 +263,7 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv)fn (domid, wait_for_it ? &deathw :NULL ,0 , fallback_trigger);if (wait_for_it) -wait_for_domain_deaths (&deathw,1 ); +wait_for_domain_deaths (&deathw,1 , wait_for_it ==1 ); }
Signature · 1 line
2.25.1
Jason Andryuk writes ("[PATCH] xl: Allow shutdown wait for domain death"):
Quoted 7 lines
xl shutdown -wwaits for the first of either domain shutdown or death. Shutdown is the halting of the guest operating system, and death is the freeing of domain resources.Allow specifying -w multiple times to wait for only domain death. This is useful in scripts so that all resources are free before the script continues.
Thanks!
Paul, I think this is a candidate for 4.14. Without this patch it is not possible to reliably wait for a domain, with xl, and then restart it. (At least not without a good deal of pratting about and polling with xl list.) osstest has a `sleep' as a workaround...
I have reviewed this patch particularly carefully with a view to understanding what happens if you pass just one `-w' as before. I have convinced myself that there is definitely no change, so I don't think this patch can introduce a regression.
Ian.
Quoted 80 lines
Signed-off-by Jason Andryuk <[email protected]>--- docs/man/xl.1.pod.in | 4 +++- tools/xl/xl_vmcontrol.c | 17 +++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-)docs/man/xl.1.pod.in +3
-1@@ -743,7 +743,9 @@ of a Xen system. =item B<-w>, B<--wait> -Wait for the domain to complete shutdown before returning. +Wait for the domain to complete shutdown before returning. If given once, +the wait is for domain shutdown or domain death. If given multiple times, +the wait is for domain death only. =item B<-F>tools/xl/xl_vmcontrol.c +11
-6@@ -162,7 +162,8 @@ static void shutdown_domain(uint32_t domid, } } -static void wait_for_domain_deaths (libxl_evgen_domain_death **deathws,int nr) +static void wait_for_domain_deaths (libxl_evgen_domain_death **deathws,int nr, +int wait_for_shutdown_or_death) {int rc, count =0 ;LOG ("Waiting for %d domains" , nr);@@ -183,8 +184,12 @@ static void wait_for_domain_deaths(libxl_evgen_domain_death **deathws, int nr)case LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN :LOG ("Domain %d has been shut down, reason code %d" , event->domid, event->u.domain_shutdown.shutdown_reason); -libxl_evdisable_domain_death (ctx, deathws[event->for_user]); - count++; +if (wait_for_shutdown_or_death) { +libxl_evdisable_domain_death (ctx, deathws[event->for_user]); + count++; + }else { +LOG ("Domain %d continue waiting for death" , event->domid); + }break ;default :LOG ("Unexpected event type %d" , event->type);@@ -214,7 +219,7 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv) all =1 ;break ;case 'w' : - wait_for_it =1 ; + wait_for_it++;break ;case 'F' : fallback_trigger =1 ;@@ -246,7 +251,7 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv) }if (deathws) { -wait_for_domain_deaths (deathws, nrdeathws); +wait_for_domain_deaths (deathws, nrdeathws, wait_for_it ==1 );free (deathws); }@@ -258,7 +263,7 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv)fn (domid, wait_for_it ? &deathw :NULL ,0 , fallback_trigger);if (wait_for_it) -wait_for_domain_deaths (&deathw,1 ); +wait_for_domain_deaths (&deathw,1 , wait_for_it ==1 ); }Signature · 1 line
2.25.1
Quoted 16 lines
-----Original Message-----
From: Ian Jackson <[email protected]>
Sent: 18 June 2020 16:44
To: Jason Andryuk <[email protected]>; Paul Durrant <[email protected]>
Cc: [email protected]; Wei Liu <[email protected]>; Anthony Perard <[email protected]>
Subject: Re: [PATCH for-4.14] xl: Allow shutdown wait for domain deathJason Andryuk writes ("[PATCH] xl: Allow shutdown wait for domain death"):
Quoted 7 lines
xl shutdown -wwaits for the first of either domain shutdown or death. Shutdown is the halting of the guest operating system, and death is the freeing of domain resources.Allow specifying -w multiple times to wait for only domain death. This is useful in scripts so that all resources are free before the script continues.
Quoted 9 lines
Thanks!
Reviewed-by Ian Jackson <[email protected]>Paul, I think this is a candidate for 4.14. Without this patch it is not possible to reliably wait for a domain, with xl, and then restart it. (At least not without a good deal of pratting about and polling with xl list.) osstest has a `sleep' as a workaround...
Yes, it would nice to drop such workarounds.
Quoted 4 lines
I have reviewed this patch particularly carefully with a view to understanding what happens if you pass just one `-w' as before. I have convinced myself that there is definitely no change, so I don't think this patch can introduce a regression.
Ok, I'll trust your judgement.
Quoted 83 lines
Ian.
Quoted 80 lines
Signed-off-by Jason Andryuk <[email protected]>--- docs/man/xl.1.pod.in | 4 +++- tools/xl/xl_vmcontrol.c | 17 +++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-)docs/man/xl.1.pod.in +3
-1@@ -743,7 +743,9 @@ of a Xen system. =item B<-w>, B<--wait> -Wait for the domain to complete shutdown before returning. +Wait for the domain to complete shutdown before returning. If given once, +the wait is for domain shutdown or domain death. If given multiple times, +the wait is for domain death only. =item B<-F>tools/xl/xl_vmcontrol.c +11
-7@@ -162,7 +162,8 @@ static void shutdown_domain(uint32_t domid, } } -static void wait_for_domain_deaths (libxl_evgen_domain_death **deathws,int nr) +static void wait_for_domain_deaths (libxl_evgen_domain_death **deathws,int nr, +int wait_for_shutdown_or_death) {int rc, count =0 ;LOG ("Waiting for %d domains" , nr);@@ -183,8 +184,12 @@ static void wait_for_domain_deaths(libxl_evgen_domain_death **deathws, int nr)case LIBXL_EVENT_TYPE_DOMAIN_SHUTDOWN :LOG ("Domain %d has been shut down, reason code %d" , event->domid, event->u.domain_shutdown.shutdown_reason); -libxl_evdisable_domain_death (ctx, deathws[event->for_user]); - count++; +if (wait_for_shutdown_or_death) { +libxl_evdisable_domain_death (ctx, deathws[event->for_user]); + count++; + }else { +LOG ("Domain %d continue waiting for death" , event->domid); + }break ;default :LOG ("Unexpected event type %d" , event->type);@@ -214,7 +219,7 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv) all =1 ;break ;case 'w' : - wait_for_it =1 ; + wait_for_it++;break ;case 'F' : fallback_trigger =1 ;@@ -246,7 +251,7 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv) }if (deathws) { -wait_for_domain_deaths (deathws, nrdeathws); +wait_for_domain_deaths (deathws, nrdeathws, wait_for_it ==1 );free (deathws); }@@ -258,7 +263,7 @@ static int main_shutdown_or_reboot(int do_reboot, int argc, char **argv)fn (domid, wait_for_it ? &deathw :NULL ,0 , fallback_trigger);if (wait_for_it) -wait_for_domain_deaths (&deathw,1 ); +wait_for_domain_deaths (&deathw,1 , wait_for_it ==1 ); } --2.25.1
Paul Durrant writes ("RE: [PATCH for-4.14] xl: Allow shutdown wait for domain death"):
Quoted 2 lines
Quoted 2 lines
-----Original Message-----
From: Ian Jackson <[email protected]>
...
Quoted 6 lines
Quoted 4 lines
I have reviewed this patch particularly carefully with a view to understanding what happens if you pass just one `-w' as before. I have convinced myself that there is definitely no change, so I don't think this patch can introduce a regression.
Ok, I'll trust your judgement.
Thanks :-). Pushed.
Ian.