ocaml/database/master_connection.ml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
# HG changeset patch # User Marcus Granado <[email protected]> # Date 1270659835 -3600 # Node ID 0f9d0be92ca44dddf1369c8d8528fcd2e11d284f # Parent fd3d5790a92a3460f8d72517bbe126eb52f6777f CA-36936: add todo comment Signed-off-by: Marcus Granado <[email protected]> diff -r fd3d5790a92a -r 0f9d0be92ca4 ocaml/database/master_connection.ml --- a/ocaml/database/master_connection.ml Wed Apr 07 17:36:39 2010 +0100 +++ b/ocaml/database/master_connection.ml Wed Apr 07 18:03:55 2010 +0100 @@ -139,13 +139,14 @@ write_ok := true; result := res (* yippeee! return and exit from while loop *) with + (* TODO: This http exception handler caused CA-36936 and can probably be removed now that there's backoff delay in the generic handler _ below *) | Xmlrpcclient.Http_error (http_code,err_msg) -> error "Received HTTP error %s (%s) from master. This suggests our master address is wrong. Sleeping for %.0fs and then restarting." http_code err_msg Xapi_globs.permanent_master_failure_retry_timeout; Thread.delay Xapi_globs.permanent_master_failure_retry_timeout; exit Xapi_globs.restart_return_code | _ -> begin - (* RPC failed - there's no way we can recover from this so try reopening connection every 2s *) + (* RPC failed - there's no way we can recover from this so try reopening connection every 2s + backoff delay *) begin match !my_connection with None -> ()
# HG changeset patch # User Marcus Granado <[email protected]> # Date 1270659835 -3600 # Node ID 0f9d0be92ca44dddf1369c8d8528fcd2e11d284f # Parent fd3d5790a92a3460f8d72517bbe126eb52f6777f CA-36936: add todo comment Signed-off-by: Marcus Granado <[email protected]> diff -r fd3d5790a92a -r 0f9d0be92ca4 ocaml/database/master_connection.ml --- a/ocaml/database/master_connection.ml Wed Apr 07 17:36:39 2010 +0100 +++ b/ocaml/database/master_connection.ml Wed Apr 07 18:03:55 2010 +0100 @@ -139,13 +139,14 @@ write_ok := true; result := res (* yippeee! return and exit from while loop *) with + (* TODO: This http exception handler caused CA-36936 and can probably be removed now that there's backoff delay in the generic handler _ below *) | Xmlrpcclient.Http_error (http_code,err_msg) -> error "Received HTTP error %s (%s) from master. This suggests our master address is wrong. Sleeping for %.0fs and then restarting." http_code err_msg Xapi_globs.permanent_master_failure_retry_timeout; Thread.delay Xapi_globs.permanent_master_failure_retry_timeout; exit Xapi_globs.restart_return_code | _ -> begin - (* RPC failed - there's no way we can recover from this so try reopening connection every 2s *) + (* RPC failed - there's no way we can recover from this so try reopening connection every 2s + backoff delay *) begin match !my_connection with None -> ()
_______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
