[Xen-API] [PATCH 5 of 8] [CA-31705] Improves error handling within vm-memory-target-wait

[Jonathan Knowles <jonathan.knowles@xxxxxxxxxxxxx>]

# HG changeset patch
# User Jonathan Knowles <jonathan.knowles@xxxxxxxxxxxxx>
# Date 1264782768 0
# Node ID 95ec61e9032f58578b29a77d96a81ab044c4ebfb
# Parent  1200307a6261ae198abc9013a6dd3bc0cd6ddbdb
[CA-31705] Improves error handling within vm-memory-target-wait.

Changes the timeout handler to use the caller-supplied timeout value rather 
than the default.

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

diff -r 1200307a6261 -r 95ec61e9032f ocaml/xapi/xapi_vm_helpers.ml
--- a/ocaml/xapi/xapi_vm_helpers.ml     Fri Jan 29 16:30:56 2010 +0000
+++ b/ocaml/xapi/xapi_vm_helpers.ml     Fri Jan 29 16:32:48 2010 +0000
@@ -692,7 +692,7 @@
                                 its target = %Ld bytes; actual = %Ld bytes."
                                accumulated_wait_time_seconds domain_id
                                memory_target_bytes memory_actual_bytes;
-                       if accumulated_wait_time_seconds > 
wait_memory_target_timeout_seconds
+                       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)]));
1 file changed, 1 insertion(+), 1 deletion(-)
ocaml/xapi/xapi_vm_helpers.ml |    2 +-

xen-api.hg-8.patch
Description: Text Data

_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api