From 9b1781164ab8468b279da2b980a6c78e949a539a Mon Sep 17 00:00:00 2001 From: "James F. Carter" Date: Fri, 26 Jan 2018 15:03:44 +0000 Subject: [PATCH 1/2] avoid fatal error on client connection timeout --- src/server/client.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/server/client.c b/src/server/client.c index 8b57b47..0614a6d 100644 --- a/src/server/client.c +++ b/src/server/client.c @@ -234,6 +234,10 @@ int client_read_request( struct client * client , struct nbd_request *out_reques debug( "Connection reset while" " reading request" ); return 0; + case ETIMEDOUT: + debug( "Connection timed out while" + " reading request" ); + return 0; default: /* FIXME: I've seen this happen, but I * couldn't reproduce it so I'm leaving From b2007c9dad6c94dd9b8852107191ced34e00ee2b Mon Sep 17 00:00:00 2001 From: "James F. Carter" Date: Fri, 26 Jan 2018 15:06:26 +0000 Subject: [PATCH 2/2] debian: uodate changelog --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2e3d4de..a99a8dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ flexnbd (0.1.8) UNRELEASED; urgency=medium - * Set TCP keepalive on sockets so broken connections are reaped (#33, !33) + * Set TCP keepalive on sockets so broken connections are reaped (#33, !33, + !36) * Add a context to logs to make debugging problems easier (#34, !34) -- James Carter Thu, 11 Jan 2018 10:05:35 +0000