Merge pull request #1016 from johnelse/ca-98936

CA-98936: Stop xapi from creating files in /tmp every time it gets an update from xenopsd

Author: Jon Ludlam

ocaml/xapi/xapi_xenops.ml

@@ -664,8 +664,6 @@ module Xenopsd_metadata = struct
 				delete_nolock ~__context id
 			)
 
-	let counter = ref 0
-
 	let update ~__context ~self =
 		let id = id_of_vm ~__context ~self in
 		Mutex.execute metadata_m
@@ -674,15 +672,6 @@ module Xenopsd_metadata = struct
 				if vm_exists_in_xenopsd dbg id
 				then
 					let txt = create_metadata ~__context ~upgrade:false ~self |> Metadata.rpc_of_t |> Jsonrpc.to_string in
-					begin match Xapi_cache.find_nolock id with
-						| Some old ->
-							if old <> txt then begin
-								Unixext.write_string_to_file (Printf.sprintf "/tmp/metadata.old.%d" !counter) old;
-								Unixext.write_string_to_file (Printf.sprintf "/tmp/metadata.new.%d" !counter) txt;
-								incr counter
-							end
-						| None -> ()
-					end;
 					begin match Xapi_cache.find_nolock id with
 						| Some old when old = txt -> ()
 						| _ ->