[Xen-API] [PATCH 6 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 1264783035 0
# Node ID 2ae5e49447b6c40b76b02c8e170b20b81d3c8263
# Parent  95ec61e9032f58578b29a77d96a81ab044c4ebfb
[CA-31705] Improves error handling within vm-memory-target-wait.

Changes the "task-cancelled" error handler to report the public task UUID, 
rather than an opaque task reference.

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

diff -r 95ec61e9032f -r 2ae5e49447b6 ocaml/xapi/xapi_vm_helpers.ml
--- a/ocaml/xapi/xapi_vm_helpers.ml     Fri Jan 29 16:32:48 2010 +0000
+++ b/ocaml/xapi/xapi_vm_helpers.ml     Fri Jan 29 16:37:15 2010 +0000
@@ -652,8 +652,8 @@
        let rec wait accumulated_wait_time_seconds =
                if TaskHelper.is_cancelling ~__context
                        then raise (Api_errors.Server_error
-                               (Api_errors.task_cancelled,
-                               [Ref.string_of (Context.get_task_id 
__context)]));
+                               (Api_errors.task_cancelled, [(Db.Task.get_uuid 
__context
+                               (Context.get_task_id __context))]));
                let domain_id = Helpers.domid_of_vm ~__context ~self in
                let memory_actual_bytes =
                        let domain_info = Vmopshelpers.with_xc
1 file changed, 2 insertions(+), 2 deletions(-)
ocaml/xapi/xapi_vm_helpers.ml |    4 ++--

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

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