# HG changeset patch
# User Jonathan Knowles <jonathan.knowles@xxxxxxxxxxxxx>
# Date 1264783041 0
# Node ID 8f7fbffae087f6a9292de089226977bf9291c7d5
# Parent  2ae5e49447b6c40b76b02c8e170b20b81d3c8263
[CA-31705] Improves error handling within vm-memory-target-wait.

Upgrades the timeout error handler so that it reports the last-seen values of memory_actual and memory_target, rather than an opaque task reference.

Signed-off-by: Jonathan Knowles <jonathan.knowles@xxxxxxxxxxxxx>

diff -r 2ae5e49447b6 -r 8f7fbffae087 ocaml/xapi/xapi_vm_helpers.ml
--- a/ocaml/xapi/xapi_vm_helpers.ml	Fri Jan 29 16:37:15 2010 +0000
+++ b/ocaml/xapi/xapi_vm_helpers.ml	Fri Jan 29 16:37:21 2010 +0000
@@ -695,7 +695,9 @@
 			if accumulated_wait_time_seconds > timeout_seconds
 				then raise (Api_errors.Server_error
 					(Api_errors.vm_memory_target_wait_timeout,
-					[Ref.string_of (Context.get_task_id __context)]));
+					[ Printf.sprintf "target = %Ld bytes" memory_target_bytes
+					; Printf.sprintf "actual = %Ld bytes" memory_actual_bytes
+					]));
 			(* The memory target has not yet been reached: *)
 			(* wait for a while before repeating the test. *)
 			Thread.delay 1.0;