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.

Reported-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Zheng Li <dev@zheng.li>
Reviewed-by: David Scott <dave.scott@citrix.com>
This commit is contained in:
Zheng Li authored and Ian Jackson committed 2017-04-05 15:26:37 +01:00
1 parent 53a6387e03
commit edfddb3da8
1 file changed
+5 -2
+5 -2
View File
@@ -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
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.