openvstorage · domsj · May 11, 2017 · May 10, 2017 · May 11, 2017 · May 11, 2017
diff --git a/Makefile b/Makefile
@@ -31,11 +31,11 @@ build-cmxs: build-alba
 
 build-nsm-plugin: build-cmxs
 	cd ocaml && ocamlfind ocamlopt \
+	_build/src/tools/prelude.cmx \
 	_build/alba_version.cmx \
 	_build/src/range_query_args.cmx \
 	_build/src/tools/lwt_bytes2.cmx \
 	_build/src/tools/lwt_extra2.cmx \
-	_build/src/tools/prelude.cmx \
 	_build/src/tools/deser.cmx \
 	_build/src/tools/cache.cmx \
 	_build/src/tools/weak_pool.cmx \
@@ -73,10 +73,10 @@ build-nsm-plugin: build-cmxs
 
 build-mgr-plugin: build-alba
 	cd ocaml && ocamlfind ocamlopt \
+	_build/src/tools/prelude.cmx \
 	_build/alba_version.cmx \
 	_build/src/tools/lwt_bytes2.cmx \
 	_build/src/tools/lwt_extra2.cmx \
-	_build/src/tools/prelude.cmx \
 	_build/src/range_query_args.cmx \
 	_build/src/tools/deser.cmx \
 	_build/src/tools/cache.cmx \

diff --git a/jenkins/run2.sh b/jenkins/run2.sh
@@ -9,6 +9,8 @@ export DRIVER=./setup/setup.native
 
 export ARAKOON_BIN=$(which arakoon)
 
+echo "ensure that all files open! Prelude"
+find ocaml/src -name '*.ml' | while read f; do grep -q 'open! Prelude' $f || [ $f == "ocaml/src/tools/prelude.ml" ] || { echo $f && exit 1; }; done
 
 if [ -t 1 ] || [[ ${1-bash} == "test_integrate_"* ]]
 then true;

diff --git a/ocaml/src/alba.ml b/ocaml/src/alba.ml
@@ -18,7 +18,7 @@ but WITHOUT ANY WARRANTY of any kind.
 
 open Cmdliner
 open Lwt.Infix
-open Prelude
+open! Prelude
 open Cli_common
 
 let () =

diff --git a/ocaml/src/alba_arakoon.ml b/ocaml/src/alba_arakoon.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Arakoon_client_config
 
 module Config =

diff --git a/ocaml/src/alba_arakoon_deser.ml b/ocaml/src/alba_arakoon_deser.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Alba_arakoon
 
 module Config =

diff --git a/ocaml/src/alba_base_client.ml b/ocaml/src/alba_base_client.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Lwt.Infix
 open Checksum
 open Lwt_bytes2

diff --git a/ocaml/src/alba_based_osd.ml b/ocaml/src/alba_based_osd.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 
 let to_namespace_name prefix = function
   | 0 -> fun namespace_id ->

diff --git a/ocaml/src/alba_bench.ml b/ocaml/src/alba_bench.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Lwt.Infix
 open Generic_bench
 

diff --git a/ocaml/src/alba_client.ml b/ocaml/src/alba_client.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Fragment_cache
 open Alba_statistics
 open Alba_client_errors

diff --git a/ocaml/src/alba_client2.ml b/ocaml/src/alba_client2.ml
@@ -16,6 +16,8 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
+open! Prelude
+
 let make_client albamgr_client_cfg
                 ?fragment_cache
                 ?manifest_cache_size

diff --git a/ocaml/src/alba_client_common.ml b/ocaml/src/alba_client_common.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Alba_client_errors
 
 let get_best_policy policies osds_info_cache =

diff --git a/ocaml/src/alba_client_download.ml b/ocaml/src/alba_client_download.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Lwt_bytes2
 open Slice
 open Alba_statistics

diff --git a/ocaml/src/alba_client_download_slices.ml b/ocaml/src/alba_client_download_slices.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Alba_interval
 open Alba_client_errors
 open Slice

diff --git a/ocaml/src/alba_client_errors.ml b/ocaml/src/alba_client_errors.ml
@@ -16,6 +16,8 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
+open! Prelude
+
 module Error = struct
   type t =
     | ChecksumMismatch

diff --git a/ocaml/src/alba_client_message_delivery.ml b/ocaml/src/alba_client_message_delivery.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Slice
 open Checksum
 open Lwt.Infix

diff --git a/ocaml/src/alba_client_message_delivery_base.ml b/ocaml/src/alba_client_message_delivery_base.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Lwt.Infix
 
 let deliver_messages :

diff --git a/ocaml/src/alba_client_namespace.ml b/ocaml/src/alba_client_namespace.ml
@@ -16,6 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
+open! Prelude
 open Lwt.Infix
 
 let create_namespace

diff --git a/ocaml/src/alba_client_osd.ml b/ocaml/src/alba_client_osd.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Slice
 open Checksum
 open Lwt.Infix

diff --git a/ocaml/src/alba_client_preset_cache.ml b/ocaml/src/alba_client_preset_cache.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Lwt.Infix
 
 let _propagate_preset

diff --git a/ocaml/src/alba_client_sequence.ml b/ocaml/src/alba_client_sequence.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Checksum
 open Lwt.Infix
 

diff --git a/ocaml/src/alba_client_upload.ml b/ocaml/src/alba_client_upload.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Slice
 open Lwt_bytes2
 open Recovery_info

diff --git a/ocaml/src/alba_eviction.ml b/ocaml/src/alba_eviction.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Lwt.Infix
 
 let do_random_eviction

diff --git a/ocaml/src/alba_json.ml b/ocaml/src/alba_json.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Encryption
 open Albamgr_protocol.Protocol
 

diff --git a/ocaml/src/alba_osd.ml b/ocaml/src/alba_osd.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Slice
 open Alba_based_osd
 open Lwt.Infix

diff --git a/ocaml/src/alba_osd_test.ml b/ocaml/src/alba_osd_test.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Lwt.Infix
 
 let test_with_kvs_client

diff --git a/ocaml/src/alba_statistics.ml b/ocaml/src/alba_statistics.ml
@@ -16,6 +16,8 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
+open! Prelude
+
 module Statistics = struct
 
   let section = Lwt_log.Section.make "statistics"

diff --git a/ocaml/src/alba_test.ml b/ocaml/src/alba_test.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Slice
 open Encryption
 open Lwt.Infix

diff --git a/ocaml/src/albamgr_access.ml b/ocaml/src/albamgr_access.ml
@@ -16,6 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
+open! Prelude
 open Remotes
 
 class basic_mgr_pooled (albamgr_pool : Pool.Albamgr.t) =

diff --git a/ocaml/src/albamgr_client.ml b/ocaml/src/albamgr_client.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Lwt.Infix
 open Albamgr_protocol
 open Protocol

diff --git a/ocaml/src/albamgr_plugin.ml b/ocaml/src/albamgr_plugin.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Registry
 open Lwt.Infix
 open Albamgr_protocol

diff --git a/ocaml/src/albamgr_protocol.ml b/ocaml/src/albamgr_protocol.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Statistics_collection
 
 module Protocol = struct

diff --git a/ocaml/src/albamgr_protocol_test.ml b/ocaml/src/albamgr_protocol_test.ml
@@ -16,6 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
+open! Prelude
 open Albamgr_protocol
 
 let make_info () =

diff --git a/ocaml/src/albamgr_test.ml b/ocaml/src/albamgr_test.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Lwt.Infix
 open Albamgr_protocol.Protocol
 

diff --git a/ocaml/src/arith64.ml b/ocaml/src/arith64.ml
@@ -16,6 +16,8 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
+open! Prelude
+
 type operation =
   | PLUS_EQ
 

diff --git a/ocaml/src/asd_bench.ml b/ocaml/src/asd_bench.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Lwt_bytes2
 open Lwt.Infix
 open Cmdliner

diff --git a/ocaml/src/asd_client.ml b/ocaml/src/asd_client.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Lwt.Infix
 open Slice
 open Lwt_bytes2

diff --git a/ocaml/src/asd_config.ml b/ocaml/src/asd_config.ml
@@ -16,6 +16,8 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
+open! Prelude
+
 module Config = struct
 
   type tls = { cert: string;

diff --git a/ocaml/src/asd_io_scheduler.ml b/ocaml/src/asd_io_scheduler.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Lwt_buffer
 open Lwt.Infix
 

diff --git a/ocaml/src/asd_protocol.ml b/ocaml/src/asd_protocol.ml
@@ -16,7 +16,7 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
-open Prelude
+open! Prelude
 open Slice
 open Checksum
 open Asd_statistics

diff --git a/ocaml/src/asd_protocol_test.ml b/ocaml/src/asd_protocol_test.ml
@@ -16,8 +16,10 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
+open! Prelude
 open Asd_protocol
 open Protocol
+
 let roundtrip test_ctx =
   let k = "the_key" in
   let v = "the_value" in

diff --git a/ocaml/src/asd_server.ml b/ocaml/src/asd_server.ml
@@ -17,7 +17,7 @@ but WITHOUT ANY WARRANTY of any kind.
 *)
 
 open Lwt.Infix
-open Prelude
+open! Prelude
 open Rocks_store
 open Asd_protocol
 open Slice

diff --git a/ocaml/src/asd_statistics.ml b/ocaml/src/asd_statistics.ml
@@ -16,6 +16,8 @@ Open vStorage is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY of any kind.
 *)
 
+open! Prelude
+
 module AsdStatistics = struct
     module G = Statistics_collection.Generic
     type t = G.t