Fix vitastor-nbd spinning forever after NBD_CMD_DISC #142

Merged
vitalif merged 1 commits from koolkhel/vitastor:nbd-disc-exit into master 2026-11-21 11:28:20 +03:00

View File

@@ -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;
}