tools/oxenstored: Fix Oxenstored Live Update
PATCH 1/1 tools/oxenstored: Fix Oxenstored Live Update
tl;dr This hunk was part of the patch emailed to xen-devel, but was missing from what ultimately got committed.
https://lore.kernel.org/xen-devel/4164cb728313c3b9fc38cf5e9ecb790ac93a9600.1610748224.git.edvin.torok@citrix.com/
is the patch in question, but was part of a series that had threading issues. I have a vague recollection that I sourced the commits from a local branch, which clearly wasn't as up-to-date as I had thought.
Either way, it's my fault/mistake, and this hunk should have been part of what got comitted.
---
CC: Christian Lindig <[email protected]>
CC: David Scott <[email protected]>
CC: Edwin Torok <[email protected]>
CC: Rob Hoes <[email protected]>
CC: Henry Wang <[email protected]>
Found while reviewing the XenServer patchqueue. This is low risk for 4.17 and fixes a feature which we thought had been working since 4.15.
--- tools/ocaml/xenstored/xenstored.ml | 5 +++++ 1 file changed, 5 insertions(+)
tools/ocaml/xenstored/xenstored.ml +5 -0
@@ -352,6 +352,11 @@ let _ = rw_sock ) in + (* required for xenstore-control to detect availability of live-update *) + Store.mkdir store Perms.Connection.full_rights (Store.Path.of_string "/tool"); + Store.write store Perms.Connection.full_rights + (Store.Path.of_string "/tool/xenstored") Sys.executable_name; + Sys.set_signal Sys.sighup (Sys.Signal_handle sighup_handler); Sys.set_signal Sys.sigterm (Sys.Signal_handle (fun _ -> info "Received SIGTERM";
Signature · 1 line
2.11.0
On 20 Oct 2022, at 12:38, Andrew Cooper <[email protected]<mailto:[email protected]>> wrote:
tl;dr This hunk was part of the patch emailed to xen-devel, but was missing from what ultimately got committed.
https://lore.kernel.org/xen-devel/4164cb728313c3b9fc38cf5e9ecb790ac93a9600.1610748224.git.edvin.torok@citrix.com/
is the patch in question, but was part of a series that had threading issues. I have a vague recollection that I sourced the commits from a local branch, which clearly wasn't as up-to-date as I had thought.
Either way, it's my fault/mistake, and this hunk should have been part of what got comitted.
Hi Andrew,
Quoted 27 lines
-----Original Message-----
From: Andrew Cooper <[email protected]>
Subject: [PATCH for-4.17]tools/oxenstored: Fix Oxenstored Live Updatetl;dr This hunk was part of the patch emailed to xen-devel, but was missing from what ultimately got committed.
https://lore.kernel.org/xen-
devel/4164cb728313c3b9fc38cf5e9ecb790ac93a9600.1610748224.git.edvin.t [email protected]/
is the patch in question, but was part of a series that had threading issues. I have a vague recollection that I sourced the commits from a local branch, which clearly wasn't as up-to-date as I had thought.Either way, it's my fault/mistake, and this hunk should have been part of what
got comitted.Fixes 00c48f57ab36 ("tools/oxenstored: Start live update process")Signed-off-by Andrew Cooper <[email protected]>---
CC: Christian Lindig <[email protected]>
CC: David Scott <[email protected]>
CC: Edwin Torok <[email protected]>
CC: Rob Hoes <[email protected]>
CC: Henry Wang <[email protected]>
Quoted 3 lines
Found while reviewing the XenServer patchqueue. This is low risk for 4.17 and
fixes a feature which we thought had been working since 4.15.
The commit message and above scissors line have described the situation quite clear, so I don't think there is any reason to ignore this patch.
Kind regards,
Henry
Quoted 25 lines
--- tools/ocaml/xenstored/xenstored.ml | 5 +++++ 1 file changed, 5 insertions(+)tools/ocaml/xenstored/xenstored.ml +5
-0@@ -352,6 +352,11 @@ let _ = rw_sock ) in + (* required for xenstore-control to detect availability of live-update *) + Store.mkdir store Perms.Connection.full_rights (Store.Path.of_string "/tool"); + Store.write store Perms.Connection.full_rights + (Store.Path.of_string "/tool/xenstored") Sys.executable_name; + Sys.set_signal Sys.sighup (Sys.Signal_handle sighup_handler);tools/ocaml/xenstored/xenstored.ml +0
-1Sys.set_signal Sys.sigterm (Sys.Signal_handle (fun _ -> info "Received SIGTERM"; --2.11.0
Quoted 33 lines · Henry Wang
Hi Andrew,
Quoted 27 lines
-----Original Message-----
From: Andrew Cooper <[email protected]>
Subject: [PATCH for-4.17]tools/oxenstored: Fix Oxenstored Live Updatetl;dr This hunk was part of the patch emailed to xen-devel, but was missing from what ultimately got committed.
https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Fxen-&data=05%7C01%7Cedvin.torok%40citrix.com%7Cfd3a03c987ce448875f808dab29903ee%7C335836de42ef43a2b145348c2ee9ca5b%7C0%7C0%7C638018667544851864%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=8AnK0Bhh9D%2B0KR75I0zeqwB8GB10JLjUtqkwTtprans%3D&reserved=0
devel/4164cb728313c3b9fc38cf5e9ecb790ac93a9600.1610748224.git.edvin.t [email protected]/
is the patch in question, but was part of a series that had threading issues. I have a vague recollection that I sourced the commits from a local branch, which clearly wasn't as up-to-date as I had thought.Either way, it's my fault/mistake, and this hunk should have been part of what
got comitted.Fixes 00c48f57ab36 ("tools/oxenstored: Start live update process")Signed-off-by Andrew Cooper <[email protected]>---
CC: Christian Lindig <[email protected]>
CC: David Scott <[email protected]>
CC: Edwin Torok <[email protected]>
CC: Rob Hoes <[email protected]>
CC: Henry Wang <[email protected]>
Quoted 8 lines
Quoted 3 lines
Found while reviewing the XenServer patchqueue. This is low risk for 4.17 and
fixes a feature which we thought had been working since 4.15.The commit message and above scissors line have described the situation quite clear, so I don't think there is any reason to ignore this patch.
Release-acked-by Henry Wang <[email protected]>
Thanks.
Further testing has revealed another bug, patch here:
https://lore.kernel.org/xen-devel/12d90632bf881e96e0b6c256df193f00df187dc1.1666284745.git.edvin.torok@citrix.com/T/#u
For convenience the commit is also available from git:
https://github.com/edwintorok/xen/commit/12d90632bf881e96e0b6c256df193f00df187dc1
With both of these patches a smoketest 'xenstore-control live-update' with a stopped toolstack works now.
Best regards,
--Edwin
Quoted 31 lines
Kind regards,
HenryQuoted 25 lines
---
tools/ocaml/xenstored/xenstored.ml| 5 +++++1 file changed, 5 insertions(+)tools/ocaml/xenstored/xenstored.ml +5
-0@@ -352,6 +352,11 @@ let _ = rw_sock ) in + (* required for xenstore-control to detect availability of live-update *) + Store.mkdir store Perms.Connection.full_rights (Store.Path.of_string "/tool"); + Store.write store Perms.Connection.full_rights + (Store.Path.of_string "/tool/xenstored") Sys.executable_name; + Sys.set_signal Sys.sighup (Sys.Signal_handle sighup_handler);Sys.set_signal Sys.sigterm (Sys.Signal_handle (fun _ -> info "Received SIGTERM";--
2.11.0
Christian Lindig
Acked-byOn 20 Oct 2022, at 17:56, Edwin Torok <[email protected]<mailto:[email protected]>> wrote:
Further testing has revealed another bug, patch here:
https://lore.kernel.org/xen-devel/12d90632bf881e96e0b6c256df193f00df187dc1.1666284745.git.edvin.torok@citrix.com/T/#u
For convenience the commit is also available from git:
https://github.com/edwintorok/xen/commit/12d90632bf881e96e0b6c256df193f00df187dc1
With both of these patches a smoketest 'xenstore-control live-update' with a stopped toolstack works now.