[sheepdog] [PATCH v3] sockfd_cache: close socket always when node is crashed

[MORITA Kazutaka]

From: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>

When timeout happens, we cannot reuse the socket for other transfers
because data may remain in its send (or recv) buffer.  We have to
close the socket before making the sockfd_cache reusable.

Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
---

v3:
 - don't remove sockfd_cache_del() after sockfd_cache_close()

v2:
 - add sockfd_cache_close() to close a timeout fd

 sheep/sockfd_cache.c |   23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/sheep/sockfd_cache.c b/sheep/sockfd_cache.c
index 45d9d04..1b9644f 100644
--- a/sheep/sockfd_cache.c
+++ b/sheep/sockfd_cache.c
@@ -428,6 +428,27 @@ static void sockfd_cache_put(const struct node_id *nid, int idx)
 	pthread_rwlock_unlock(&sockfd_cache.lock);
 }
 
+static void sockfd_cache_close(const struct node_id *nid, int idx)
+{
+	bool use_io = nid->io_port ? true : false;
+	const uint8_t *addr = use_io ? nid->io_addr : nid->addr;
+	int port = use_io ? nid->io_port : nid->port;
+	struct sockfd_cache_entry *entry;
+	char name[INET6_ADDRSTRLEN];
+
+	addr_to_str(name, sizeof(name), addr, 0);
+	sd_dprintf("%s:%d idx %d", name, port, idx);
+
+	pthread_rwlock_wrlock(&sockfd_cache.lock);
+	entry = sockfd_cache_search(nid);
+	if (entry) {
+		close(entry->fds[idx].fd);
+		entry->fds[idx].fd = -1;
+		uatomic_set_false(&entry->fds[idx].in_use);
+	}
+	pthread_rwlock_unlock(&sockfd_cache.lock);
+}
+
 /*
  * Return a sockfd connected to the vnode to the caller
  *
@@ -498,7 +519,7 @@ void sheep_del_sockfd(const struct node_id *nid, struct sockfd *sfd)
 		return;
 	}
 
-	sockfd_cache_put(nid, sfd->idx);
+	sockfd_cache_close(nid, sfd->idx);
 	sockfd_cache_del(nid);
 	free(sfd);
 }
-- 
1.7.9.5