[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH for-4.17] tools/ocaml/xenstored: fix live update exception
- To: Edwin Torok <edvin.torok@xxxxxxxxxx>
- From: Christian Lindig <christian.lindig@xxxxxxxxxx>
- Date: Fri, 21 Oct 2022 07:50:16 +0000
- Accept-language: en-GB, en-US
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HaPfP+NZXDV0k3oeQwlzMMBo3EA5m69EX33dDOguIbE=; b=ctxkSIBv893ODW2qRErPiHbyYBqOEz11HTzugQLiEqxaIm3Fj37kddA4b89ZoaWicq2tVc9YQ+WLmrvY2eVznbsT1nw0J/rwEIyFU4n6p5wAFqzvrX2gswnrGfXLg35ndRqqh9wTqTmmThRt2bqnnffTnK3Gc/kJ4cQDWERTdiPpiHbaiPWKWuo2aoopX4UYTrPi8yx7W20pLgBD7V+2mAlic80gkAonojbre8jhGMGU/7/TZPjdOpCSRM8mLdstAGTv9QiwIvOH23j/RhQNuWKvHMyhZFFcx/KakzUMkrA+8Qqg11MAPzVOY5Ed1fAJ6O10vhgOinBOOWXTZlV2Yg==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sa/6jgqutBpMlk7WRmKolUsDFeu0vDhSAlLc+YCMzeslhlsD5qSsJFV+qzohmG9wkWxsObzW94HkPC96ZzMV5Ao+comWg97HT9BYX0K8Q//BkBpnsxmxNHwKkZuIOIfIoigp3ZtHnFOjMbCpnoWHhhaOGT+svr+k+h2fRzA93/X4kpTigzoqZz4QhB1k7lzRiTQzFVEYTbM9kLcoSsQZ8NwSMl2dUPTlkr4/JbDYCPlqxHEdLpSU3Hdm9KD+0CCltvR7lsPyP8SKu/szIDFKa9p0bTgp6AeSwGldQhu7t+rn1YB2iCxQzR1C0dLF35A4eg8TLdyPEBJqEvgnSyCb8Q==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
- Cc: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>, David Scott <dave@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Anthony Perard <anthony.perard@xxxxxxxxxx>, Henry Wang <Henry.Wang@xxxxxxx>, Andrew Cooper <Andrew.Cooper3@xxxxxxxxxx>
- Delivery-date: Fri, 21 Oct 2022 07:50:26 +0000
- Ironport-data: A9a23:PWcbq6my82r/A8PFdJqmyrXo5gyzJ0RdPkR7XQ2eYbSJt1+Wr1Gzt xJLXmGBaf2INGD3LtpxYNi+9hkCvcDdzIVkQQdopCk8RSMWpZLJC+rCIxarNUt+DCFhoGFPt JxCN4aafKjYaleG+39B55C49SEUOZmgH+a6UqicUsxIbVcMYD87jh5+kPIOjIdtgNyoayuAo tq3qMDEULOf82cc3lk8tuTS9XuDgNyo4GlC5wRkPKgS1LPjvyJ94Kw3dPnZw0TQGuG4LsbiL 87fwbew+H/u/htFIrtJRZ6iLyXm6paLVeS/oiI+t5qK23CulQRrukoPD9IOaF8/ttm8t4sZJ OOhF3CHYVxB0qXkwIzxWvTDes10FfUuFLTveRBTvSEPpqFvnrSFL/hGVSkL0YMkFulfK0ges tIqGT82Tj+olfC3+Y2Wcc5Xr5F2RCXrFNt3VnBI6xj8VK5jZK+ZBqLA6JlfwSs6gd1IEbDGf c0FZDFzbRPGJRpSJlMQD5F4l+Ct7pX9W2QA9BTJ+uxqvi6KlFMZPLvFabI5fvSBRd9UhVqZr 2SA+2X/DhAVHNee1SCE4jSngeqncSbTCNlITebmrKUCbFu7w2o9ARcITASHj/iwyRWBac8cB E0uw397xUQ13AnxJjXnZDWorXjBshMCVt54F+wh9BrL2qfS+xyeBGUPUnhGctNOnMM/WzECz FKCmNLtQzt1v9W9Vna15rqS6zSoNkA9DWIEfz5CcgID7PHquoR1hRXKJuuPC4awh9zxXDTvm TaDqXFmg61J1JZUkaKm4VrAnjSg4IDTSRI47RnWWWTj6R5lYImiZMqj7l2zAet8Ebt1h2Kp5 BAs8/VyJshTZX1RvERhmNkwIYw=
- Ironport-hdrordr: A9a23:2InL2qugY/CABeMh5izPl+Gr7skC1YMji2hC6mlwRA09TyXGra 2TdaUgvyMc1gx7ZJh5o6H6BEGBKUmslqKceeEqTPqftXrdyRGVxeZZnMffKlzbamfDH4tmuZ uIHJIOb+EYYWIasS++2njBLz9C+qjJzEnLv5a5854Fd2gDBM9dBkVCe3+m+yZNNWt77O8CZf 6hD7181l+dkBosDviTNz0gZazuttfLnJXpbVotHBg88jSDijuu9frTDwWY9g12aUIP/Z4StU z+1yDp7KSqtP+2jjXG0XXI0phQkNz9jvNeGc23jNQPIDmEsHfpWG0hYczAgNkGmpDr1L8Yqq iJn/7mBbU115rlRBD2nfIq4Xin7N9h0Q669bbSuwqfnSWwfkNHNyMGv/MWTvKR0TtfgPhslK 1MxG6XrJxREFfJmzn8/cHBU1VwmlOzumdKq59bs5TOObFuF4O5gLZvi3+9Kq1wah7S+cQiCq 1jHcvc7PFZfReTaG3YpHBmxJipUm4oFhmLT0AesojNugIm10xR3g8d3ogSj30A/JUyR91N4P nFKL1hkPVLQtUNZaxwCe8dSY+8C3DLQxjLLGWOSG6XXJ0vKjbIsdr68b817OaldNgBy4Yzgo 3IVBdCuWs7ayvVeLmzNV1wg2XwqUmGLEfQI5tllulEU5XHNcrWGDzGTkwymM29pPhaCtHHWp +ISeBrP8M=
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Thread-index: AQHY5KTJYQJiWLa1lkaa66iTW6pU/q4YejoA
- Thread-topic: [PATCH for-4.17] tools/ocaml/xenstored: fix live update exception
> On 20 Oct 2022, at 17:54, Edwin Török <edvin.torok@xxxxxxxxxx> wrote:
>
> During live update we will load the /tool/xenstored path from the previous
> binary,
> and then try to mkdir /tool again which will fail with EEXIST.
> Check for existence of the path before creating it.
>
> The write call to /tool/xenstored should not need any changes
> (and we do want to overwrite any previous path, in case it changed).
>
> Prior to 7110192b1df6 live update would work only if the binary path was
> specified, and with 7110192b1df6 and this live update also works when
> no binary path is specified in `xenstore-control live-update`.
>
> Fixes: 7110192b1df6 ("tools/oxenstored: Fix Oxenstored Live Update")
> Signed-off-by: Edwin Török <edvin.torok@xxxxxxxxxx>
> ---
> tools/ocaml/xenstored/xenstored.ml | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/ocaml/xenstored/xenstored.ml
> b/tools/ocaml/xenstored/xenstored.ml
> index fc90fcdeb5..3299fe73f7 100644
> --- a/tools/ocaml/xenstored/xenstored.ml
> +++ b/tools/ocaml/xenstored/xenstored.ml
> @@ -353,7 +353,9 @@ let _ =
> ) in
>
> (* required for xenstore-control to detect availability of live-update
> *)
> - Store.mkdir store Perms.Connection.full_rights (Store.Path.of_string
> "/tool");
> + let tool_path = Store.Path.of_string "/tool" in
> + if not (Store.path_exists store tool_path) then
> + Store.mkdir store
> Perms.Connection.full_rights tool_path;
> Store.write store Perms.Connection.full_rights
> (Store.Path.of_string "/tool/xenstored") Sys.executable_name;
I notice inconsistent indentation but let's ignore that or fix it before the
committing.
Acked-by: Christian Lindig <christian.lindig@xxxxxxxxxx>
|
