From d9497d38c9c960026760ac29d1bc86e366a134d7 Mon Sep 17 00:00:00 2001 From: Yury Luneff Date: Fri, 20 Nov 2026 16:47:38 +0300 Subject: [PATCH] Fix vitastor-nbd spinning forever after NBD_CMD_DISC The NBD_CMD_DISC branch closed the socket and returned without preparing the next read, so handle_read() looped forever on any bytes that followed the disconnect request in the same recvmsg(), ignoring `stop` and SIGTERM. The kernel sends such requests after the NBD_DISCONNECT ioctl, for example when the device is opened and its partition table is re-read. The closed descriptor also stayed in use: a read or a reply submitted after it failed with EBADF, and the process exited with code 1 in the middle of the final sync. Forget the descriptor once it is closed and stop parsing, reading and sending after that. --- src/client/nbd_proxy.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/client/nbd_proxy.cpp b/src/client/nbd_proxy.cpp index a5293d4c..9a24d339 100644 --- a/src/client/nbd_proxy.cpp +++ b/src/client/nbd_proxy.cpp @@ -730,6 +730,7 @@ help: if (epoll_events & EPOLLRDHUP) { close(peer_fd); + nbd_fd = -1; stop = true; } else @@ -1081,7 +1082,7 @@ protected: void submit_send() { - if (!send_list.size() || send_msg.msg_iovlen > 0) + if (nbd_fd < 0 || !send_list.size() || send_msg.msg_iovlen > 0) { return; } @@ -1100,7 +1101,7 @@ protected: void handle_send(int result) { send_msg.msg_iovlen = 0; - if (result < 0 && result != -EAGAIN) + if (result < 0 && result != -EAGAIN && nbd_fd >= 0) { fprintf(stderr, "Socket disconnected: %s\n", strerror(-result)); exit(1); @@ -1139,7 +1140,7 @@ protected: void submit_read() { - if (!read_ready || read_msg.msg_iovlen > 0) + if (nbd_fd < 0 || !read_ready || read_msg.msg_iovlen > 0) { return; } @@ -1168,7 +1169,7 @@ protected: void handle_read(int result) { read_msg.msg_iovlen = 0; - if (result < 0 && result != -EAGAIN) + if (result < 0 && result != -EAGAIN && nbd_fd >= 0) { fprintf(stderr, "Socket disconnected: %s\n", strerror(-result)); exit(1); @@ -1182,7 +1183,7 @@ protected: ringloop->wakeup(); } void *b = recv_buf; - while (result > 0) + while (result > 0 && nbd_fd >= 0) { if (read_iov.iov_base == recv_buf) { @@ -1216,6 +1217,7 @@ protected: { // Disconnect close(nbd_fd); + nbd_fd = -1; stop = true; return; } -- 2.47.3