Skip to content

Commit 3eeff78

Browse files
authored
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
2 parents 9d4f2ab + 09f8784 commit 3eeff78

37 files changed

+1137
-1695
lines changed

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ ff39018fd6d91985f9c893a56928771dfe9fa48d
3030
cbb9edb17dfd122c591beb14d1275acc39492335
3131
d6ab15362548b8fe270bd14d5153b8d94e1b15c0
3232
b12cf444edea15da6274975e1b2ca6a7fce2a090
33+
364c27f5d18ab9dd31825e67a93efabecad06823
34+
d8b4de9076531dd13bdffa20cc10c72290a52356
3335

3436
# ocp-indent
3537
d018d26d6acd4707a23288b327b49e44f732725e

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@ install-extra:
150150
DUNE_IU_PACKAGES1=-j $(JOBS) --destdir=$(DESTDIR) --prefix=$(PREFIX) --libdir=$(LIBDIR) --mandir=$(MANDIR)
151151
DUNE_IU_PACKAGES1+=--libexecdir=$(XENOPSD_LIBEXECDIR) --datadir=$(SDKDIR)
152152
DUNE_IU_PACKAGES1+=xapi-client xapi-schema xapi-consts xapi-cli-protocol xapi-datamodel xapi-types
153-
DUNE_IU_PACKAGES1+=xen-api-client xen-api-client-lwt xen-api-client-async rrdd-plugin rrd-transport
153+
DUNE_IU_PACKAGES1+=xen-api-client xen-api-client-lwt rrdd-plugin rrd-transport
154154
DUNE_IU_PACKAGES1+=gzip http-lib pciutil sexpr stunnel uuid xml-light2 zstd xapi-compression safe-resources
155-
DUNE_IU_PACKAGES1+=message-switch message-switch-async message-switch-cli message-switch-core message-switch-lwt
155+
DUNE_IU_PACKAGES1+=message-switch message-switch-cli message-switch-core message-switch-lwt
156156
DUNE_IU_PACKAGES1+=message-switch-unix xapi-idl forkexec xapi-forkexecd xapi-storage xapi-storage-script xapi-storage-cli
157157
DUNE_IU_PACKAGES1+=xapi-nbd varstored-guard xapi-log xapi-open-uri xapi-tracing xapi-tracing-export xapi-expiry-alerts cohttp-posix
158158
DUNE_IU_PACKAGES1+=xapi-rrd xapi-inventory clock xapi-sdk

dune-project

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@
6161
)
6262

6363

64-
(package
65-
(name xen-api-client-async)
66-
)
67-
6864
(package
6965
(name xen-api-client)
7066
(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.")
527523
(name pciutil)
528524
)
529525

530-
(package
531-
(name message-switch-async)
532-
)
533-
534526
(package
535527
(name message-switch-lwt)
536528
)

message-switch-async.opam

Lines changed: 0 additions & 35 deletions
This file was deleted.

message-switch-async.opam.template

Lines changed: 0 additions & 33 deletions
This file was deleted.

message-switch.opam

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ depends: [
1818
"dune" {>= "3.15"}
1919
"odoc" {with-doc}
2020
"cmdliner"
21-
"cohttp-async" {with-test}
2221
"cohttp-lwt-unix"
2322
"io-page" {>= "2.4.0"}
2423
"lwt_log"
25-
"message-switch-async" {with-test}
2624
"message-switch-lwt"
2725
"message-switch-unix"
2826
"mirage-block-unix" {>= "2.4.0"}

message-switch.opam.template

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ depends: [
1616
"dune" {>= "3.15"}
1717
"odoc" {with-doc}
1818
"cmdliner"
19-
"cohttp-async" {with-test}
2019
"cohttp-lwt-unix"
2120
"io-page" {>= "2.4.0"}
2221
"lwt_log"
23-
"message-switch-async" {with-test}
2422
"message-switch-lwt"
2523
"message-switch-unix"
2624
"mirage-block-unix" {>= "2.4.0"}

ocaml/message-switch/async/dune

Lines changed: 0 additions & 17 deletions
This file was deleted.

ocaml/message-switch/async/protocol_async.ml

Lines changed: 0 additions & 141 deletions
This file was deleted.

ocaml/message-switch/async/protocol_async.mli

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)