IH-397: Replace async with lwt in xapi-storage-script (#6019)

This allows to remove all dependencies on async and core. Compared to previous PRs, the new glue code has been put into a library and tests have been added, mainly Process.run. The directory watcher does not have unit tests. This code has passed internal suites on Sept 20th: Storage GFS2 BVT: 205277 Storage GFS2 Regression: 205278 Storage GFS2 Functional: 205279 Since then, I've rebased the branch and added more tests, but there were no conflicts to be resolved. The build made on top of latest xapi master is passed the toolstack suite: Ring3 BST + BVT: 205582
xapi-project · Oct 3, 2024 · 3eeff78 · 3eeff78
2 parents 9d4f2ab + 09f8784
commit 3eeff78
Show file tree

Hide file tree

Showing 37 changed files with 1,137 additions and 1,695 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -30,6 +30,8 @@ ff39018fd6d91985f9c893a56928771dfe9fa48d
 cbb9edb17dfd122c591beb14d1275acc39492335
 d6ab15362548b8fe270bd14d5153b8d94e1b15c0
 b12cf444edea15da6274975e1b2ca6a7fce2a090
+364c27f5d18ab9dd31825e67a93efabecad06823
+d8b4de9076531dd13bdffa20cc10c72290a52356
 
 # ocp-indent
 d018d26d6acd4707a23288b327b49e44f732725e

diff --git a/Makefile b/Makefile
@@ -150,9 +150,9 @@ install-extra:
 DUNE_IU_PACKAGES1=-j $(JOBS) --destdir=$(DESTDIR) --prefix=$(PREFIX) --libdir=$(LIBDIR) --mandir=$(MANDIR)
 DUNE_IU_PACKAGES1+=--libexecdir=$(XENOPSD_LIBEXECDIR) --datadir=$(SDKDIR)
 DUNE_IU_PACKAGES1+=xapi-client xapi-schema xapi-consts xapi-cli-protocol xapi-datamodel xapi-types
-DUNE_IU_PACKAGES1+=xen-api-client xen-api-client-lwt xen-api-client-async rrdd-plugin rrd-transport
+DUNE_IU_PACKAGES1+=xen-api-client xen-api-client-lwt rrdd-plugin rrd-transport
 DUNE_IU_PACKAGES1+=gzip http-lib pciutil sexpr stunnel uuid xml-light2 zstd xapi-compression safe-resources
-DUNE_IU_PACKAGES1+=message-switch message-switch-async message-switch-cli message-switch-core message-switch-lwt
+DUNE_IU_PACKAGES1+=message-switch message-switch-cli message-switch-core message-switch-lwt
 DUNE_IU_PACKAGES1+=message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-storage-cli
 DUNE_IU_PACKAGES1+=xapi-nbd varstored-guard xapi-log xapi-open-uri xapi-tracing xapi-tracing-export xapi-expiry-alerts cohttp-posix
 DUNE_IU_PACKAGES1+=xapi-rrd xapi-inventory clock xapi-sdk

diff --git a/dune-project b/dune-project
@@ -61,10 +61,6 @@
 )
 
 
-(package
-  (name xen-api-client-async)
-)
-
 (package
   (name xen-api-client)
   (synopsis "Xen-API client library for remotely-controlling a xapi host")
@@ -527,10 +523,6 @@ This package provides an Lwt compatible interface to the library.")
   (name pciutil)
 )
 
-(package
-  (name message-switch-async)
-)
-
 (package
   (name message-switch-lwt)
 )

diff --git a/message-switch-async.opam b/message-switch-async.opam
diff --git a/message-switch-async.opam.template b/message-switch-async.opam.template
diff --git a/message-switch.opam b/message-switch.opam
@@ -18,11 +18,9 @@ depends: [
   "dune" {>= "3.15"}
   "odoc" {with-doc}
   "cmdliner"
-  "cohttp-async" {with-test}
   "cohttp-lwt-unix"
   "io-page" {>= "2.4.0"}
   "lwt_log"
-  "message-switch-async" {with-test}
   "message-switch-lwt"
   "message-switch-unix"
   "mirage-block-unix" {>= "2.4.0"}

diff --git a/message-switch.opam.template b/message-switch.opam.template
@@ -16,11 +16,9 @@ depends: [
   "dune" {>= "3.15"}
   "odoc" {with-doc}
   "cmdliner"
-  "cohttp-async" {with-test}
   "cohttp-lwt-unix"
   "io-page" {>= "2.4.0"}
   "lwt_log"
-  "message-switch-async" {with-test}
   "message-switch-lwt"
   "message-switch-unix"
   "mirage-block-unix" {>= "2.4.0"}

diff --git a/ocaml/message-switch/async/dune b/ocaml/message-switch/async/dune
diff --git a/ocaml/message-switch/async/protocol_async.ml b/ocaml/message-switch/async/protocol_async.ml
diff --git a/ocaml/message-switch/async/protocol_async.mli b/ocaml/message-switch/async/protocol_async.mli