diff options
Diffstat (limited to '0020-tools-oxenstored-Log-live-update-issues-at-warning-l.patch')
| -rw-r--r-- | 0020-tools-oxenstored-Log-live-update-issues-at-warning-l.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/0020-tools-oxenstored-Log-live-update-issues-at-warning-l.patch b/0020-tools-oxenstored-Log-live-update-issues-at-warning-l.patch new file mode 100644 index 0000000..533e3e7 --- /dev/null +++ b/0020-tools-oxenstored-Log-live-update-issues-at-warning-l.patch @@ -0,0 +1,42 @@ +From 991b512f5f69dde3c923804f887be9df56b03a74 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= <edvin.torok@citrix.com> +Date: Tue, 8 Nov 2022 08:57:47 +0000 +Subject: [PATCH 20/89] tools/oxenstored: Log live update issues at warning + level +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +During live update, oxenstored tries a best effort approach to recover as many +domains and information as possible even if it encounters errors restoring +some domains. + +However, logging about misunderstood input is more severe than simply info. +Log it at warning instead. + +Signed-off-by: Edwin Török <edvin.torok@citrix.com> +Acked-by: Christian Lindig <christian.lindig@citrix.com> +(cherry picked from commit 3f02e0a70fe9f8143454b742563433958d4a87f8) +--- + tools/ocaml/xenstored/xenstored.ml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml +index f526f4fb23..35b8cbd43f 100644 +--- a/tools/ocaml/xenstored/xenstored.ml ++++ b/tools/ocaml/xenstored/xenstored.ml +@@ -186,9 +186,9 @@ let from_channel_f chan global_f evtchn_f socket_f domain_f watch_f store_f = + (Perms.Node.of_string (unhexify perms ^ "\000")) + (unhexify value) + | _ -> +- info "restoring: ignoring unknown line: %s" line ++ warn "restoring: ignoring unknown line: %s" line + with exn -> +- info "restoring: ignoring unknown line: %s (exception: %s)" ++ warn "restoring: ignoring unknown line: %s (exception: %s)" + line (Printexc.to_string exn); + () + with End_of_file -> +-- +2.40.0 + |