Merge pull request #5860 from stephenchengCloud/private/stephenche/sync_with_master

Sync feature/py3 branch with master

Author: liulinC

.github/workflows/other.yml

@@ -58,6 +58,7 @@ jobs:
           --cov-fail-under 0
         env:
           PYTHONDEVMODE: yes
+          PYTHONPATH: "python3:python3/stubs"
 
       - name: Upload coverage report to Coveralls
         uses: coverallsapp/github-action@v2

.gitignore

@@ -2,6 +2,7 @@ _build/
 *.bak
 *.native
 .merlin
+_coverage/
 *.install
 *.swp
 compile_flags.txt

Makefile

@@ -6,7 +6,7 @@ JOBS = $(shell getconf _NPROCESSORS_ONLN)
 PROFILE=release
 OPTMANDIR ?= $(OPTDIR)/man/man1/
 
-.PHONY: build clean test doc python format install uninstall
+.PHONY: build clean test doc python format install uninstall coverage
 
 # if we have XAPI_VERSION set then set it in dune-project so we use that version number instead of the one obtained from git
 # this is typically used when we're not building from a git repo
@@ -20,6 +20,11 @@ build:
 check:
 	dune build @check -j $(JOBS)
 
+coverage:
+	dune runtest --instrument-with bisect_ppx --force --profile=$(RELEASE) -j $(JOBS)
+	bisect-ppx-report html
+	bisect-ppx-report summary --per-file
+
 clean:
 	dune clean
 
@@ -57,6 +62,7 @@ TEST_TIMEOUT=600
 TEST_TIMEOUT2=1200
 test:
 	ulimit -S -t $(TEST_TIMEOUT); \
+	ulimit -n 2048; \
 	 (sleep $(TEST_TIMEOUT) && ps -ewwlyF --forest)& \
 	 PSTREE_SLEEP_PID=$$!; \
 	 trap "kill $${PSTREE_SLEEP_PID}" INT TERM EXIT; \
@@ -204,6 +210,7 @@ install: build doc sdk doc-json
 	install -D -m 755 _build/install/default/bin/xcp-rrdd-iostat $(DESTDIR)$(LIBEXECDIR)/xcp-rrdd-plugins/xcp-rrdd-iostat
 	install -D -m 755 _build/install/default/bin/xcp-rrdd-squeezed $(DESTDIR)$(LIBEXECDIR)/xcp-rrdd-plugins/xcp-rrdd-squeezed
 	install -D -m 755 _build/install/default/bin/xcp-rrdd-xenpm $(DESTDIR)$(LIBEXECDIR)/xcp-rrdd-plugins/xcp-rrdd-xenpm
+	install -D -m 755 _build/install/default/bin/xcp-rrdd-dcmi $(DESTDIR)$(LIBEXECDIR)/xcp-rrdd-plugins/xcp-rrdd-dcmi
 	install -D -m 644 ocaml/xcp-rrdd/bugtool-plugin/rrdd-plugins.xml $(DESTDIR)$(ETCXENDIR)/bugtool/xcp-rrdd-plugins.xml
 	install -D -m 644 ocaml/xcp-rrdd/bugtool-plugin/rrdd-plugins/stuff.xml $(DESTDIR)$(ETCXENDIR)/bugtool/xcp-rrdd-plugins/stuff.xml
 	install -D -m 755 ocaml/xcp-rrdd/bin/rrdp-scripts/sysconfig-rrdd-plugins $(DESTDIR)/etc/sysconfig/xcp-rrdd-plugins

doc/content/xapi/guides/howtos/add-field.md

@@ -1,7 +1,7 @@
 +++
 title = "Adding a field to the API"
 +++
-This page describes how to add a field to XenAPI. A field is a parameter of a class that can be used in functions and read from the API. 
+This page describes how to add a field to XenAPI. A field is a parameter of a class that can be used in functions and read from the API.
 
 Bumping the database schema version
 -----------------------------------
@@ -34,15 +34,15 @@ new API fields used for ActiveDirectory integration were added:
 
       (* IMPORTANT: Please bump schema vsn if you change/add/remove a _field_.
          You do not have to dump vsn if you change/add/remove a message *)
-    
+
       let schema_major_vsn = 5
      -let schema_minor_vsn = 55
      +let schema_minor_vsn = 56
-    
+
       (* Historical schema versions just in case this is useful later *)
       let rio_schema_major_vsn = 5
       let rio_schema_minor_vsn = 19
-    
+
      +let miami_release_schema_major_vsn = 5
      +let miami_release_schema_minor_vsn = 35
      +
@@ -95,7 +95,7 @@ See datamodel_types.ml for information about other parameters.
 Adding a field would change the constructors for the class – functions
 Db.*.create – and therefore, any references to these in the code need to be
 updated. In the example, the argument ~ha_enabled:false should be added to any
-call to Db.Pool.create. 
+call to Db.Pool.create.
 
 Examples of where these calls can be found is in `ocaml/tests/common/test_common.ml` and `ocaml/xapi/xapi_[class].ml`.
 
@@ -113,7 +113,7 @@ if you don't want this field to show up in a *_params_list call. As an example,
 here is a field that we've just added to the SM class:
 
     make_field ~name:"versioned-capabilities"
-               ~get:(fun () -> Record_util.s2sm_to_string "; " (x ()).API.sM_versioned_capabilities)
+               ~get:(fun () -> get_from_map (x ()).API.sM_versioned_capabilities)
                ~get_map:(fun () -> (x ()).API.sM_versioned_capabilities)
                ~hidden:true ();
 

dune-project

@@ -2,6 +2,8 @@
 (formatting (enabled_for ocaml))
 (using menhir 2.0)
 
+(cram enable)
+(implicit_transitive_deps false)
 (generate_opam_files true)
 
 (name "xapi")
@@ -559,6 +561,8 @@ This package provides an Lwt compatible interface to the library.")
     base-unix
     (odoc :with-doc)
     (xapi-stdext-pervasives (= :version))
+    (mtime :with-test)
+    (xapi-stdext-unix (= :version))
   )
 )
 
@@ -568,12 +572,19 @@ This package provides an Lwt compatible interface to the library.")
   (authors "Jonathan Ludlam")
   (depends
     (ocaml (>= 4.12.0))
+    (alcotest :with-test)
     base-unix
+    (bisect_ppx :with-test)
     (fd-send-recv (>= 2.0.0))
+    fmt
+    (mtime (and (>= 2.0.0) :with-test))
+    (logs :with-test)
+    (qcheck-core (and (>= 0.21.2) :with-test))
     (odoc :with-doc)
     xapi-backtrace
     unix-errno
     (xapi-stdext-pervasives (= :version))
+    polly
   )
 )
 

ocaml/database/dune

@@ -41,6 +41,7 @@
     xapi-datamodel
     xapi-log
     (re_export xapi-schema)
+    xapi-idl.updates
     xapi-stdext-encodings
     xapi-stdext-pervasives
     xapi-stdext-std

ocaml/database/master_connection.ml

@@ -271,7 +271,7 @@ let do_db_xml_rpc_persistent_with_reopen ~host:_ ~path (req : string) :
           !Db_globs.permanent_master_failure_retry_interval ;
         Thread.delay !Db_globs.permanent_master_failure_retry_interval ;
         !Db_globs.restart_fn ()
-    | e -> (
+    | e ->
         error "Caught %s" (Printexc.to_string e) ;
         (* RPC failed - there's no way we can recover from this so try reopening connection every 2s + backoff delay *)
         ( match !my_connection with
@@ -322,9 +322,7 @@ let do_db_xml_rpc_persistent_with_reopen ~host:_ ~path (req : string) :
           debug "%s: Sleep interrupted, retrying master connection now"
             __FUNCTION__ ;
         update_backoff_delay () ;
-        try open_secure_connection () with _ -> ()
-        (* oh well, maybe nextime... *)
-      )
+        D.log_and_ignore_exn open_secure_connection
   done ;
   !result
 

ocaml/database/redo_log.ml

@@ -642,7 +642,8 @@ let startup log =
           ) ;
           match !(log.device) with
           | None ->
-              D.info "Could not find block device"
+              D.info "Could not find block device" ;
+              broken log
           | Some device ->
               D.info "Using block device at %s" device ;
               (* Check that the block device exists *)

ocaml/forkexecd/lib/dune

@@ -7,6 +7,7 @@
    fd-send-recv
    rpclib.core
    rpclib.json
+   rpclib.xml
    uuid
    xapi-backtrace
    xapi-log

ocaml/forkexecd/test/dune

@@ -1,7 +1,7 @@
 (executable
  (modes exe)
  (name fe_test)
- (libraries forkexec uuid xapi-stdext-unix))
+ (libraries forkexec uuid xapi-stdext-unix fd-send-recv))
 
 (rule
  (alias runtest)