[Xen-changelog] [xen master] oxenstored: catch the error when a connection is already deleted

[patchbot@xxxxxxx]

commit 57ba43cdf804998fc7dd70025d870effb4b4686c
Author:     Zheng Li <dev@xxxxxxxx>
AuthorDate: Thu Sep 25 18:34:57 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Oct 8 14:18:46 2014 +0100

    oxenstored: catch the error when a connection is already deleted
    
    The function process_fdset_with is called on the read set connections first.
    During the process, it might destroy a connection and remove it from the
    connections database if some errors occur. However, a reference to the same
    connection might still exist in the write set, which is awaiting to be
    processed next. In this case, a Not_found error will be raised and the 
process
    is aborted.
    
    This patch changes the logic to ignore connections just missing from the
    connection database and continue the rest part of the work.
    
    Signed-off-by: Zheng Li <dev@xxxxxxxx>
    Reviewed-by: David Scott <dave.scott@xxxxxxxxxx>
---
 tools/ocaml/xenstored/xenstored.ml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/ocaml/xenstored/xenstored.ml 
b/tools/ocaml/xenstored/xenstored.ml
index dacea21..ea1a08f 100644
--- a/tools/ocaml/xenstored/xenstored.ml
+++ b/tools/ocaml/xenstored/xenstored.ml
@@ -43,8 +43,11 @@ let process_connection_fds store cons domains rset wset =
                        debug "closing socket connection"
                in
        let process_fdset_with fds fct =
-               List.iter (fun fd -> try_fct fct (Connections.find cons fd)) fds
-       in
+               List.iter
+                       (fun fd ->
+                        try try_fct fct (Connections.find cons fd)
+                        with Not_found -> ()
+                       ) fds in
        process_fdset_with rset Process.do_input;
        process_fdset_with wset Process.do_output
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog