Sync master to feature branch (#6984)

Author: liulinC

dune-project

@@ -235,7 +235,7 @@
   fmt
   logs
   mtime
-  xapi-backtrace
+  rpclib
   (xapi-stdext-pervasives (= :version))))
 
 (package
@@ -322,7 +322,6 @@
   uuidm
   uutf
   x509
-  xapi-backtrace
   xapi-log
   xapi-types
   xapi-stdext-pervasives
@@ -451,7 +450,6 @@
   uutf
   uuidm
   x509
-  xapi-backtrace
   (xapi-client
    (= :version))
   (xapi-cli-protocol
@@ -764,7 +762,6 @@
   uri
   (uuid
    (= :version))
-  xapi-backtrace
   (xapi-idl
    (= :version))
   (xapi-log
@@ -795,7 +792,6 @@
   rpclib
   (uuid
    (= :version))
-  xapi-backtrace
   (xapi-log
    (= :version))
   (xapi-stdext-pervasives
@@ -842,7 +838,7 @@
    (>= 4.08))
   logs
   (odoc :with-doc)
-  xapi-backtrace))
+  ))
 
 (package
  (name xapi-stdext-std)
@@ -902,7 +898,6 @@
     (>= 0.21.2)
     :with-test))
   (odoc :with-doc)
-  xapi-backtrace
   unix-errno
   (xapi-stdext-pervasives
    (= :version))

ocaml/database/dune

@@ -53,7 +53,6 @@
   httpsvr
   unix
   uuid
-  xapi-backtrace
   xapi-datamodel
   xapi-log
   (re_export xapi-schema)

ocaml/database/parse_db_conf.ml

@@ -173,8 +173,9 @@ let parse_db_conf s =
     sanity_check !connections ;
     !connections
   with exn ->
+    let bt = Printexc.get_raw_backtrace () in
     error "Database config parse failed: %s" (Printexc.to_string exn) ;
-    Backtrace.reraise exn Cannot_parse_database_config_file
+    Printexc.raise_with_backtrace Cannot_parse_database_config_file bt
 
 let get_db_conf path =
   if Sys.file_exists path then

ocaml/forkexecd/lib/dune

@@ -12,7 +12,6 @@
    rpclib.xml
    unix
    uuid
-   xapi-backtrace
    xapi-log
    xapi-stdext-pervasives
    xapi-stdext-unix

ocaml/forkexecd/lib/fe_systemctl.ml

@@ -158,7 +158,7 @@ let start_transient ?env ?properties ?(exec_ty = Type.Simple) ~service cmd args
   ) ;
   try start_transient ?env ?properties ~exec_ty ~service cmd args
   with e ->
-    Backtrace.is_important e ;
+    let bt = Printexc.get_raw_backtrace () in
     (* If start failed we do not know what state the service is in:
      * try to stop it and clean up.
      * Stopping could fail as well, in which case report the original exception.
@@ -168,4 +168,4 @@ let start_transient ?env ?properties ?(exec_ty = Type.Simple) ~service cmd args
         ()
       with _ -> ()
     ) ;
-    raise e
+    Printexc.raise_with_backtrace e bt

ocaml/gencert/dune

@@ -18,7 +18,7 @@
     rresult
     unix
     x509
-    xapi-backtrace
+    xapi-log.backtrace
     xapi-consts
     xapi-log
     xapi-inventory

ocaml/idl/datamodel_common.ml

@@ -10,7 +10,7 @@ open Datamodel_roles
               to leave a gap for potential hotfixes needing to increment the schema version.*)
 let schema_major_vsn = 5
 
-let schema_minor_vsn = 900
+let schema_minor_vsn = 901
 
 (* Historical schema versions just in case this is useful later *)
 let rio_schema_major_vsn = 5

ocaml/idl/datamodel_pool.ml

@@ -2236,9 +2236,8 @@ let t =
         ; field ~qualifier:StaticRO ~ty:Int ~default_value:(Some (VInt 1L))
             ~lifecycle:[] "ext_auth_max_threads"
             "Maximum number of threads to use for external (AD) authentication"
-        ; field ~qualifier:DynamicRO ~ty:Bool
-            ~default_value:(Some (VBool false)) ~lifecycle:[]
-            "ext_auth_cache_enabled"
+        ; field ~qualifier:DynamicRO ~ty:Bool ~default_value:(Some (VBool true))
+            ~lifecycle:[] "ext_auth_cache_enabled"
             "Specifies whether external authentication caching is enabled for \
              this pool or not"
         ; field ~qualifier:DynamicRO ~ty:Int ~default_value:(Some (VInt 50L))

ocaml/idl/dune

@@ -13,7 +13,7 @@
     sexplib0
     sexpr
     threads
-    xapi-backtrace
+    xapi-log.backtrace
     xapi-consts
     xapi-schema
     clock

ocaml/idl/ocaml_backend/gen_client.ml

@@ -319,6 +319,12 @@ let gen_module api : O.Module.t =
     ; "    | Rpc.Enum ((Rpc.String code) :: args) -> return (server_failure \
        code (List.map Rpc.string_of_rpc args))"
     ; "    | rpc -> failwith (\"Client.rpc: \" ^ Rpc.to_string rpc)"
+    ; "type client = {rpc: Rpc.call -> Rpc.response; session_id:  ref_session}"
+    ; "type 'a api = rpc:(Rpc.call -> Rpc.response) -> session_id:ref_session \
+       -> 'a"
+    ; ""
+    ; "let call {rpc; session_id} f = f ~rpc ~session_id"
+    ; ""
     ]
   in
   let postamble =