CA-85545: do not spamm the logs with harmless parsing errors

Signed-off-by: Thomas Gazagnaire <[email protected]>

Author: samoht

ocaml/xapi/helpers.ml

@@ -302,25 +302,17 @@ let rolling_upgrade_in_progress ~__context =
 		false
 
 let parse_boot_record ~string:lbr =
-	try
-		begin
-			(* initially, try to parse lbr using new default sexpr format *)
-			API.From.vM_t "ret_val" (Xmlrpc_sexpr.sexpr_str_to_xmlrpc lbr)
-		end
-	with
-		(* xapi import/upgrade fallback: if sexpr parsing fails, try parsing using legacy xmlrpc format*)
-		Api_errors.Server_error (code,_) when code=Api_errors.field_type_error ->
-			begin
-				API.From.vM_t "ret_val" (Xml.parse_string lbr)
-			end
+	match Xmlrpc_sexpr.sexpr_str_to_xmlrpc lbr with
+	| None     -> API.From.vM_t "ret_val" (Xml.parse_string lbr)
+	| Some xml -> API.From.vM_t "ret_val" xml
 
 (** Fetch the configuration the VM was booted with *)
 let get_boot_record_of_record ~__context ~string:lbr ~uuid:current_vm_uuid =
   try
     parse_boot_record lbr
   with e ->
-    warn "Warning: exception '%s' parsing last booted record - returning current record instead" (ExnHelper.string_of_exn e);
-      Db.VM.get_record ~__context ~self:(Db.VM.get_by_uuid ~__context ~uuid:current_vm_uuid)
+	(* warn "Warning: exception '%s' parsing last booted record (%s) - returning current record instead" lbr (ExnHelper.string_of_exn e); *)
+    Db.VM.get_record ~__context ~self:(Db.VM.get_by_uuid ~__context ~uuid:current_vm_uuid)
 
 let get_boot_record ~__context ~self =
   let r = Db.VM.get_record_internal ~__context ~self in

ocaml/xapi/xmlrpc_sexpr.ml

@@ -153,7 +153,9 @@ let sexpr_to_xmlrpc (root:SExpr.t) =
 let sexpr_str_to_xmlrpc (sexpr_str:string) =
 	let sroot1 = SExpr_TS.of_string sexpr_str in
 	let xroot1 = sexpr_to_xmlrpc sroot1 in
-	(xroot1)
+	match xroot1 with
+	| Element("value", [], [Element("WRONG_SEXPR",[],[])]) -> None
+	| _ -> Some xroot1
 
 (** helper function that maps between xml-rpc trees and sexpr strings *)
 let xmlrpc_to_sexpr_str xml=