WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-api

[Xen-API] [PATCH 08 of 17] CA-36391: Improve failure behaviour of xe hos

To: xen-api@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-API] [PATCH 08 of 17] CA-36391: Improve failure behaviour of xe host-apply-edition
From: Rob Hoes <rob.hoes@xxxxxxxxxx>
Date: Fri, 7 Jan 2011 16:57:51 +0000
Delivery-date: Fri, 07 Jan 2011 09:03:43 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <patchbomb.1294419463@xxxxxxxxxxxxxxxxxxxxxxx>
List-help: <mailto:xen-api-request@lists.xensource.com?subject=help>
List-id: Discussion of API issues surrounding Xen <xen-api.lists.xensource.com>
List-post: <mailto:xen-api@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-api>, <mailto:xen-api-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-api>, <mailto:xen-api-request@lists.xensource.com?subject=unsubscribe>
References: <patchbomb.1294419463@xxxxxxxxxxxxxxxxxxxxxxx>
Sender: xen-api-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mercurial-patchbomb/1.6.3
Signed-off-by: Rob Hoes <rob.hoes@xxxxxxxxxx>


# HG changeset patch
# User Rob Hoes <rob.hoes@xxxxxxxxxx>
# Date 1294419411 0
# Node ID bd7e14b4c9e36e5616530a2f14d130845edd3b07
# Parent  ee1f39a1e592c6bace29a4a3b65efb53f8162b0f
CA-36391: Improve failure behaviour of xe host-apply-edition

Signed-off-by: Rob Hoes <rob.hoes@xxxxxxxxxx>

diff -r ee1f39a1e592 -r bd7e14b4c9e3 ocaml/xapi/cli_operations.ml
--- a/ocaml/xapi/cli_operations.ml
+++ b/ocaml/xapi/cli_operations.ml
@@ -2571,6 +2571,7 @@
                        Client.Host.get_by_uuid rpc session_id (List.assoc 
"host-uuid" params)
                else
                        get_host_from_session rpc session_id in
+       let current_license_server = Client.Host.get_license_server rpc 
session_id host in
        let edition = List.assoc "edition" params in
        if List.mem_assoc "license-server-address" params then begin
                let address = List.assoc "license-server-address" params in
@@ -2592,6 +2593,8 @@
                Client.Host.apply_edition rpc session_id host edition
        with
                | Api_errors.Server_error (name, args) when name = 
Api_errors.license_checkout_error ->
+                       (* Put back original license server details *)
+                       Client.Host.set_license_server rpc session_id host 
current_license_server;
                        let alerts = Client.Message.get_since rpc session_id 
(Date.of_float now) in
                        let print_if_checkout_error (ref, msg) =
                                if msg.API.message_name = 
"LICENSE_NOT_AVAILABLE" || msg.API.message_name = "LICENSE_SERVER_UNREACHABLE" 
then

Attachment: xen-api.hg-08.patch
Description: Text Data

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