[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH for-4.17] tools/oxenstored: Fix Oxenstored Live Update


  • To: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
  • Date: Thu, 20 Oct 2022 12:38:10 +0100
  • Authentication-results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none
  • Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Christian Lindig <christian.lindig@xxxxxxxxxx>, David Scott <dave@xxxxxxxxxx>, Edwin Torok <edvin.torok@xxxxxxxxxx>, Rob Hoes <Rob.Hoes@xxxxxxxxxx>, Henry Wang <Henry.Wang@xxxxxxx>
  • Delivery-date: Thu, 20 Oct 2022 11:38:50 +0000
  • Ironport-data: A9a23:EMLJ9K0OYe4u2e6G7fbD5cVxkn2cJEfYwER7XKvMYLTBsI5bp2MGz GAbCz/VO/iIZGH2KY8jPNi28UNXv8CDydNiSwA5pC1hF35El5HIVI+TRqvS04F+DeWYFR46s J9OAjXkBJppJpMJjk71atANlVEliefSAOKU5NfsYkhZXRVjRDoqlSVtkus4hp8AqdWiCkaGt MiaT/f3YTdJ4BYpdDNJg06/gEk35q6r4GlA5gVWic1j5zcyqVFEVPrzGonpR5fIatE8NvK3Q e/F0Ia48gvxl/v6Ior4+lpTWhRiro/6ZWBiuFIPM0SRqkEqShgJ+rQ6LJIhhXJ/0F1lqTzTJ OJl7vRcQS9xVkHFdX90vxNwS0mSNoUekFPLzOTWXWV+ACQqflO1q8iCAn3aMqVG4fhMPThu2 8dAORYtMhaorbu5n4KCH7wEasQLdKEHPasas3BkizrYEewnUdbIRKCiCd1whWlqwJoURLCHO pRfOWEHgBfoOnWjPn8+Dp4kkfjurX74azBC83qepLYt4niVxwt0uFToGIqPIIHaG5wP9qqej lLb7UnBCC8YDtfF4CKlol+vo7/hmRquDer+E5Xnr6U30TV/3Fc7KBAQT0r9nvC/hWa3QdcZI EsRkgIipLY/3FamRd78W1u/unHslg4RXZ9cHvM37CmJy7HI+ECJC24cVDlDZdc68sgsSlQXO kShxo2zQ2Y16fvMFCzbpuz8QS6O1TY9c3QcXhNdbSU+u8jFgN01pTiWQYlTKfvg5jHqIg3Yz zePpSk4orwci88Xyqm2lWz6byKQSovhFVBsuFiONo6xxkYgPdP+OdT0gbTOxawYRLt1WGVtq 5TtdyK2yOkVRa+AmyWWKAnmNOH4vq3VWNEwbLMGInXAy9hP0yT+FWyzyGskTKuMDirjUWawC HI/QSsLuPdu0IKCNMebmb6ZBcUw1rTHHt/4TP3SZdcmSsEvKlHepXEyORDLgjqFfK0QfUYXY M3zTCpRJSxCVfQPIMSeHY/xLoPHNghhnDiOFPgXPjys0KaEZW79dIrpxGCmN7hjhIvd+V292 48Ga6O3J+B3DbSWjt//qtVIczjn7BETWPjLliCgXrTac1s3Rj59V6K5LHFIU9UNopm5X9zgp hmVMnK0AnKm7ZEbAW1mskxeVY4=
  • Ironport-hdrordr: A9a23:QmfSjKOIFKKOFcBcTtejsMiBIKoaSvp037Eqv3oedfU1SL3+qy nAppQmPHPP5Ar5O0tQ/exoWpPwIk80nKQdieJ6UItKNDOW3VdAR7sC0WKN+VLd8lXFh4xg6Z s=
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

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@xxxxxxxxxx/
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 <andrew.cooper3@xxxxxxxxxx>
---
CC: Christian Lindig <christian.lindig@xxxxxxxxxx>
CC: David Scott <dave@xxxxxxxxxx>
CC: Edwin Torok <edvin.torok@xxxxxxxxxx>
CC: Rob Hoes <Rob.Hoes@xxxxxxxxxx>
CC: Henry Wang <Henry.Wang@xxxxxxx>

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(+)

diff --git a/tools/ocaml/xenstored/xenstored.ml 
b/tools/ocaml/xenstored/xenstored.ml
index d44ae673c42a..fc90fcdeb5d6 100644
--- a/tools/ocaml/xenstored/xenstored.ml
+++ b/tools/ocaml/xenstored/xenstored.ml
@@ -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




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.