[infer] no longer create .lock files and only rely on Unix.rename to avoid write-write races

Reviewed By: jvillard

Differential Revision: D7453694

fbshipit-source-id: 955a018

infer/src/base/Serialization.ml

@@ -30,19 +30,6 @@ end
 (** version of the binary files, to be incremented for each change *)
 let version = 27
 
-(** Retry the function while an exception filtered is thrown,
-    or until the timeout in seconds expires. *)
-let retry_exception ~timeout ~catch_exn ~f x =
-  let init_time = Mtime_clock.counter () in
-  let expired () = Mtime.Span.compare timeout (Mtime_clock.count init_time) <= 0 in
-  let rec retry () =
-    try f x with e when catch_exn e && not (expired ()) -> Utils.yield () ; (retry [@tailcall]) ()
-  in
-  retry ()
-
-
-type 'a write_command = Replace of 'a
-
 let create_serializer (key: Key.t) : 'a serializer =
   let read_data ((key': Key.t), (version': int), (value: 'a)) source_msg =
     if key <> key' then (
@@ -62,58 +49,17 @@ let create_serializer (key: Key.t) : 'a serializer =
   let read_from_string (str: string) : 'a option =
     read_data (Marshal.from_string str 0) "string"
   in
-  (* The reads happen without synchronization.
-     The writes are synchronized with a .lock file. *)
   let read_from_file (fname: DB.filename) : 'a option =
-    let fname_str = DB.filename_to_string fname in
+    (* The serialization is based on atomic file renames,
-    match In_channel.create ~binary:true fname_str with
+       so the deserialization cannot read a file while it is being written. *)
-    | exception Sys_error _ ->
+    let filename = DB.filename_to_string fname in
-        None
+    try Utils.with_file_in filename ~f:(fun inc -> read_data (Marshal.from_channel inc) filename)
-    | inc ->
-        let read () =
-          try
-            In_channel.seek inc 0L ;
-            read_data (Marshal.from_channel inc) fname_str
     with Sys_error _ -> None
   in
-        let catch_exn = function
-          | End_of_file ->
-              true
-          | Failure _ ->
-              true (* handle input_value: truncated object *)
-          | _ ->
-              false
-        in
-        (* Retry to read for 1 second in case of end of file, *)
-        (* which indicates that another process is writing the same file. *)
-        let one_second = Mtime.Span.of_uint64_ns (Int64.of_int 1_000_000_000) in
-        SymOp.try_finally
-          ~f:(fun () -> retry_exception ~timeout:one_second ~catch_exn ~f:read ())
-          ~finally:(fun () -> In_channel.close inc)
-  in
-  let write_to_tmp_file fname data =
-    let fname_tmp =
-      Filename.temp_file ~in_dir:(Filename.dirname fname) (Filename.basename fname) ".tmp"
-    in
-    Utils.write_file_with_locking fname_tmp ~f:(fun outc ->
-        Marshal.to_channel outc (key, version, data) [] ) ;
-    fname_tmp
-  in
-  (* The .lock file is used to synchronize the writers.
-     Once a lock on `file.lock` is obtained, the new data is written into a temporary file
-     and rename is used to move it atomically to `file` *)
-  let execute_write_command_with_lock (fname: DB.filename) (cmd: 'a write_command) =
-    let fname_str = DB.filename_to_string fname in
-    let fname_str_lock = fname_str ^ ".lock" in
-    Utils.write_file_with_locking fname_str_lock ~delete:true ~f:(fun _outc ->
-        let data_to_write : 'a = match cmd with Replace data -> data in
-        let fname_str_tmp = write_to_tmp_file fname_str data_to_write in
-        (* Rename is atomic: the readers can only see one version of this file,
-             possibly stale but not corrupted. *)
-        Unix.rename ~src:fname_str_tmp ~dst:fname_str )
-  in
   let write_to_file ~(data: 'a) (fname: DB.filename) =
-    execute_write_command_with_lock fname (Replace data)
+    let filename = DB.filename_to_string fname in
+    Utils.with_intermediate_temp_file_out filename ~f:(fun outc ->
+        Marshal.to_channel outc (key, version, data) [] )
   in
   {read_from_string; read_from_file; write_to_file}
 

infer/src/base/Utils.ml

@@ -189,6 +189,18 @@ let with_file_out file ~f =
   try_finally_swallow_timeout ~f ~finally
 
 
+let with_intermediate_temp_file_out file ~f =
+  let temp_filename, temp_oc =
+    Filename.open_temp_file ~in_dir:(Filename.dirname file) "infer" ""
+  in
+  let f () = f temp_oc in
+  let finally () =
+    Out_channel.close temp_oc ;
+    Unix.rename ~src:temp_filename ~dst:file
+  in
+  try_finally_swallow_timeout ~f ~finally
+
+
 let write_json_to_file destfile json =
   with_file_out destfile ~f:(fun oc -> Yojson.Basic.pretty_to_channel oc json)
 
@@ -329,10 +341,6 @@ let rec rmtree name =
       ()
 
 
-let yield () =
-  Unix.select ~read:[] ~write:[] ~except:[] ~timeout:(`After Time_ns.Span.min_value) |> ignore
-
-
 let better_hash x = Marshal.to_string x [Marshal.No_sharing] |> Caml.Digest.string
 
 let unlink_file_on_exit temp_file =

infer/src/base/Utils.mli

@@ -56,6 +56,9 @@ val with_file_in : string -> f:(In_channel.t -> 'a) -> 'a
 
 val with_file_out : string -> f:(Out_channel.t -> 'a) -> 'a
 
+val with_intermediate_temp_file_out : string -> f:(Out_channel.t -> 'a) -> 'a
+(** like [with_file_out] but uses a fresh intermediate temporary file and rename to avoid write-write races *)
+
 val write_json_to_file : string -> Yojson.Basic.json -> unit
 
 val consume_in : In_channel.t -> unit
@@ -101,9 +104,6 @@ val try_finally_swallow_timeout : f:(unit -> 'a) -> finally:(unit -> unit) -> 'a
 (** Calls [f] then [finally] even if [f] raised an exception. The original exception is reraised afterwards.
     Where possible use [SymOp.try_finally] to avoid swallowing timeouts. *)
 
-val yield : unit -> unit
-(** try to give the control back to the OS without sleeping too much *)
-
 val better_hash : 'a -> Caml.Digest.t
 (** Hashtbl.hash only hashes the first 10 meaningful values, [better_hash] uses everything. *)