Merge branch master into feature/host-network-device-ordering (#6701)

Author: changlei-li

.git-blame-ignore-revs

@@ -32,6 +32,7 @@ d6ab15362548b8fe270bd14d5153b8d94e1b15c0
 b12cf444edea15da6274975e1b2ca6a7fce2a090
 364c27f5d18ab9dd31825e67a93efabecad06823
 d8b4de9076531dd13bdffa20cc10c72290a52356
+bdf06bca7534fbc0c4fc3cee3408a51a22615226
 
 # ocp-indent
 d018d26d6acd4707a23288b327b49e44f732725e

dune-project

@@ -1,4 +1,4 @@
-(lang dune 3.15)
+(lang dune 3.20)
 
 (formatting
  (enabled_for ocaml))

ocaml/database/db_cache_impl.ml

@@ -482,24 +482,24 @@ let spawn_db_flush_threads () =
                    try
                      Thread.delay Db_backend.db_FLUSH_TIMER ;
                      (* If I have some writing capacity left in this write period then consider doing a write; or
-                        								   if the connection is not write-limited then consider doing a write too.
-                        								   We also have to consider doing a write if exit_on_next_flush is set: because when this is
-                        								   set (by a signal handler) we want to do a flush whether or not our write limit has been
-                        								   exceeded.
+                        if the connection is not write-limited then consider doing a write too.
+                        We also have to consider doing a write if exit_on_next_flush is set: because when this is
+                        set (by a signal handler) we want to do a flush whether or not our write limit has been
+                        exceeded.
                      *)
+                     (* always flush straight away; this request is urgent
+                        otherwise, we only write if
+                          (i) "coalesscing period has come to an end"; and
+                          (ii) "write limiting requirements are met": *)
                      ( if
                          !Db_connections.exit_on_next_flush
-                         (* always flush straight away; this request is urgent *)
-                         || (* otherwise, we only write if (i) "coalesscing period has come to an end"; and (ii) "write limiting requirements are met": *)
-                         (not (in_coallescing_period ()))
-                         (* see (i) above *)
-                         && (!my_writes_this_period
-                             < dbconn.Parse_db_conf.write_limit_write_cycles
-                            || dbconn.Parse_db_conf.mode
-                               = Parse_db_conf.No_limit
-                               (* (ii) above *)
-                            )
-                       then (* debug "[%s] considering flush" db_path; *)
+                         || (not (in_coallescing_period ()))
+                            && (!my_writes_this_period
+                                < dbconn.Parse_db_conf.write_limit_write_cycles
+                               || dbconn.Parse_db_conf.mode
+                                  = Parse_db_conf.No_limit
+                               )
+                       then
                          let was_anything_flushed =
                            Xapi_stdext_threads.Threadext.Mutex.execute
                              Db_lock.global_flush_mutex (fun () ->
@@ -509,7 +509,7 @@ let spawn_db_flush_threads () =
                          if was_anything_flushed then (
                            my_writes_this_period := !my_writes_this_period + 1 ;
                            (* when we do a write, reset the coallesce_period_start to now -- recall that this
-                              												   variable tracks the time since last write *)
+                              variable tracks the time since last write *)
                            coallesce_period_start := Unix.gettimeofday ()
                          )
                      ) ;

ocaml/database/db_secret_string.mli

@@ -13,10 +13,10 @@
  *)
 
 (* Prevent direct conversions to string to avoid accidental misuse.
- * It is still possible to convert it to Rpc.t and recover it that way,
- * it is not a protection against willfully recovering the protected string
- * (we do need to send these as parameters in RPCs).
- * *)
+    It is still possible to convert it to Rpc.t and recover it that way,
+    it is not a protection against willfully recovering the protected string
+   (we do need to send these as parameters in RPCs).
+*)
 
 (** a type with no direct conversions to string *)
 type t

ocaml/database/dune

@@ -51,6 +51,7 @@
   threads.posix
   http_lib
   httpsvr
+  unix
   uuid
   xapi-backtrace
   xapi-datamodel
@@ -78,6 +79,7 @@
  (name block_device_io)
  (modules block_device_io)
  (libraries
+  unix
   xapi_database
   xapi-log
   xapi-stdext-pervasives
@@ -98,6 +100,7 @@
   http_lib
   httpsvr
   threads.posix
+  unix
   xapi_database
   xapi-stdext-threads
   xapi-stdext-unix))
@@ -113,6 +116,7 @@
   rpclib.xml
   sexplib
   sexplib0
+  unix
   xapi_database
   xml-light2))
 

ocaml/doc/dune

@@ -5,6 +5,7 @@
     mustache
     rpclib.core
     rpclib.json
+    unix
     uuid
     xapi-consts
     xapi-datamodel

ocaml/forkexecd/cli/dune

@@ -1,7 +1,7 @@
 (executable
  (modes exe)
  (name fe_cli)
- (libraries forkexec))
+ (libraries forkexec unix))
 
 (install
  (package xapi-forkexecd)

ocaml/forkexecd/lib/dune

@@ -10,6 +10,7 @@
    rpclib.core
    rpclib.json
    rpclib.xml
+   unix
    uuid
    xapi-backtrace
    xapi-log

ocaml/forkexecd/lib/fe_systemctl.ml

@@ -107,10 +107,10 @@ let show ~service =
 let stop ~service =
   action ~service "stop" ;
   (* Stopping shouldn't fail because it should fall back to SIGKILL which should almost always work,
-   * unless there is a kernel bug that keeps a process stuck.
-   * In the unlikely scenario that this does fail we leave the transient service file behind
-   * so that the failure can be investigated.
-   * *)
+     unless there is a kernel bug that keeps a process stuck.
+     In the unlikely scenario that this does fail we leave the transient service file behind
+     so that the failure can be investigated.
+  *)
   let status = show ~service in
   (* allow systemd to garbage-collect the status and the unit, preventing leaks.
    * See CollectMode in systemd.unit(5) for details. *)
@@ -162,7 +162,7 @@ let start_transient ?env ?properties ?(exec_ty = Type.Simple) ~service cmd args
     (* 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.
-     * *)
+     *)
     ( try
         let (_ : status) = stop ~service in
         ()

ocaml/forkexecd/src/child.ml

@@ -274,7 +274,7 @@ let run state comms_sock fd_sock fd_sock_path =
       let (_ : int list) = Unix.sigprocmask Unix.SIG_BLOCK [Sys.sigchld] in
 
       (* First test whether the child has exited - if it has then report this
-         * via the socket and exit. *)
+       * via the socket and exit. *)
       match Unix.waitpid [Unix.WNOHANG] result with
       | pid, status when pid = result ->
           report_child_exit comms_sock args result status ;