search for: eshutdown

The NBD specification was clarified to state that the server can send ESHUTDOWN at any time that it wants to inform the client that the server is about to close the connection and that all further commands will fail, to give the client a chance to first send NBD_CMD_DISC for a clean shutdown. While nbdkit does not (yet) directly send this errno, it is feasible that a plugin m...

https://bugzilla.netfilter.org/show_bug.cgi?id=1047 --- Comment #5 from Asbj?rn Sloth T?nnesen <asbjorn at asbjorn.it> --- Ping -- You are receiving this mail because: You are watching all bug changes. -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.netfilter.org/pipermail/netfilter-buglog/attachments/20160217/e911c053/attachment.html>

Nir, can you confirm this is correct for RHEL 7 / Python 2? Rich.

...@@ -849,12 +849,19 @@ ocaml_nbdkit_set_error (value nv) int err; switch (Int_val (nv)) { + /* On-the-wire values */ case 1: err = EPERM; break; case 2: err = EIO; break; case 3: err = ENOMEM; break; case 4: err = EINVAL; break; case 5: err = ENOSPC; break; case 6: err = ESHUTDOWN; break; + case 7: err = EOVERFLOW; break; + /* Necessary for .zero support */ + case 8: err = ENOTSUP; break; + /* Other errno that server/protocol.c treats specially */ + case 9: err = EROFS; break; + case 10: err = EFBIG; break; default: abort (); } diff --git a/plugins/ocaml/NBD...

...lse if (strncasecmp (ebuf, "EINVAL", 6) == 0) { err = EINVAL; - skip = 7; + skip = 6; } - else if (strcmp (ebuf, "ENOSPC ") == 0) { + else if (strncasecmp (ebuf, "ENOSPC", 6) == 0) { err = ENOSPC; skip = 7; } - else if (strcmp (ebuf, "ESHUTDOWN ") == 0) { + else if (strncasecmp (ebuf, "EOVERFLOW", 9) == 0) { + err = EOVERFLOW; + skip = 9; + } + else if (strncasecmp (ebuf, "ESHUTDOWN", 9) == 0) { err = ESHUTDOWN; - skip = 10; + skip = 9; } else { /* Default to EIO. */ @@ -300,6 +305,1...

With python 3, we have a nicer way to handle socket.error with errno set to EPIPE (or ESHUTDOWN). This is also more correct since in some cases (that I could not reproduce yet with v2v), using e[0] with BrokenPipeError will fail with: >>> OSError(errno.EPIPE, "Broken pipe")[0] Traceback (most recent call last): File "<stdin>", line 1, in <module> T...

...index 42c7065..3e561e6 100644 --- a/v2v/rhv-upload-plugin.py +++ b/v2v/rhv-upload-plugin.py @@ -383,8 +383,9 @@ def pwrite(h, buf, offset): try: http.send(buf) - except BrokenPipeError: - pass + except socket.error as e: + if e.args[0] not in (errno.EPIPE, errno.ESHUTDOWN): + raise r = http.getresponse() if r.status != 200: @@ -446,8 +447,9 @@ def emulate_zero(h, count, offset): http.send(buf) count -= len(buf) http.send(buffer(buf, 0, count)) - except BrokenPipeError: - pass +...

With this, I am finally able to get the nbd plugin to do out-of-order responses to the client. Once this series goes in, we should be ready for Rich to cut a release. Eric Blake (4): nbd: Split reading into separate thread nbd: Protect writes with mutex nbd: Enable parallel handling tests: Test parallel nbd behavior plugins/nbd/nbd.c | 217

...y() + * works, as the caller's next action will be calling .get_size + * and similar probe functions which we do not bother to wire up + * into retry logic because they only need to be used right after + * connecting. + */ + nbdkit_next *next_handle = NULL; + int err = ESHUTDOWN; + + while (! h->open && do_retry (h, &data, &next_handle, "open", &err)) + ; + + if (! h->open) { + free (h->exportname); + free (h); + return NULL; + } + } + return h; +} + +static void +retry_close (void *handle) +{ + struct...

...struct crypto_async_request *req, bool need_pump) > { > unsigned long flags; > int ret; > > - spin_lock_irqsave(&engine->queue_lock, flags); > - > - if (!engine->running) { > - spin_unlock_irqrestore(&engine->queue_lock, flags); > - return -ESHUTDOWN; > - } > - > - ret = ablkcipher_enqueue_request(&engine->queue, req); > - > - if (!engine->busy && need_pump) > - kthread_queue_work(engine->kworker, &engine->pump_requests); > - > - spin_unlock_irqrestore(&engine->queue_lock, flags); >...

...struct crypto_async_request *req, bool need_pump) > { > unsigned long flags; > int ret; > > - spin_lock_irqsave(&engine->queue_lock, flags); > - > - if (!engine->running) { > - spin_unlock_irqrestore(&engine->queue_lock, flags); > - return -ESHUTDOWN; > - } > - > - ret = ablkcipher_enqueue_request(&engine->queue, req); > - > - if (!engine->busy && need_pump) > - kthread_queue_work(engine->kworker, &engine->pump_requests); > - > - spin_unlock_irqrestore(&engine->queue_lock, flags); >...

...ead (struct handle *h) -{ - int err = errno; - - ACQUIRE_LOCK_FOR_CURRENT_SCOPE (&h->trans_lock); - if (!h->dead) { - nbdkit_debug ("permanent failure while talking to server %s: %m", - servname); - h->dead = true; - } - else if (!err) - errno = ESHUTDOWN; - /* NBD only accepts a limited set of errno values over the wire, and - nbdkit converts all other values to EINVAL. If we died due to an - errno value that cannot transmit over the wire, translate it to - ESHUTDOWN instead. */ - if (err == EPIPE || err == EBADMSG) - nbdkit_set_e...

...ead (struct handle *h) -{ - int err = errno; - - ACQUIRE_LOCK_FOR_CURRENT_SCOPE (&h->trans_lock); - if (!h->dead) { - nbdkit_debug ("permanent failure while talking to server %s: %m", - servname); - h->dead = true; - } - else if (!err) - errno = ESHUTDOWN; - /* NBD only accepts a limited set of errno values over the wire, and - nbdkit converts all other values to EINVAL. If we died due to an - errno value that cannot transmit over the wire, translate it to - ESHUTDOWN instead. */ - if (err == EPIPE || err == EBADMSG) - nbdkit_set_e...

...previously errno). * See http://git.qemu.org/?p=qemu.git;a=commitdiff;h=ca4414804114fd0095b317785bc0b51862e62ebb @@ -239,6 +241,7 @@ extern const char *name_of_nbd_error (int); #define NBD_EINVAL 22 #define NBD_ENOSPC 28 #define NBD_EOVERFLOW 75 +#define NBD_ENOTSUP 95 #define NBD_ESHUTDOWN 108 #endif /* NBDKIT_PROTOCOL_H */ diff --git a/server/filters.c b/server/filters.c index 14ca0cc6..0dd2393e 100644 --- a/server/filters.c +++ b/server/filters.c @@ -403,8 +403,11 @@ next_zero (void *nxdata, uint32_t count, uint64_t offset, uint32_t flags, int r; r = b_conn->b->zero...

...il. Returns -1 for convenience. */ +static int +nbd_mark_dead (struct handle *h) +{ + int err = errno; + + if (!h->dead) { + nbdkit_debug ("permanent failure while talking to server %s: %m", + sockname); + h->dead = true; + } + else if (!err) + errno = ESHUTDOWN; + /* NBD only accepts a limited set of errno values over the wire, and + nbdkit converts all other values to EINVAL. If we died due to an + errno value that cannot transmit over the wire, translate it to + ESHUTDOWN instead. */ + if (err == EPIPE || err == EBADMSG) + nbdkit_set_e...

..._command_completed (h->nbd, trans->cookie); - if (r == -1) { - nbdkit_debug ("transaction %" PRId64 " failed: %s", trans->cookie, - nbd_get_error ()); - trans->err = nbd_get_errno (); - if (!trans->err) - trans->err = ESHUTDOWN; - } - else if (!r) - trans->err = ESHUTDOWN; - if (sem_post (&trans->sem)) { - nbdkit_error ("failed to post semaphore: %m"); - abort (); - } - } nbdkit_debug ("exiting state machine thread"); return NULL; } @@ -411,6 +353,23 @@ nbdp...

..._pump) > > { > > unsigned long flags; > > int ret; > > > > - spin_lock_irqsave(&engine->queue_lock, flags); > > - > > - if (!engine->running) { > > - spin_unlock_irqrestore(&engine->queue_lock, flags); > > - return -ESHUTDOWN; > > - } > > - > > - ret = ablkcipher_enqueue_request(&engine->queue, req); > > - > > - if (!engine->busy && need_pump) > > - kthread_queue_work(engine->kworker, &engine->pump_requests); > > - > > - spin_unlock_irqrestore(...

..., + .handle = htobe64 (h->cookie), + .offset = htobe64 (offset), + .count = htobe32 (count), + }; + int r; + + /* TODO full parallel support requires tracking cookies for handling + out-of-order responses */ + *cookie = h->cookie++; + if (h->dead) { + nbdkit_set_error (ESHUTDOWN); + return -1; + } + nbdkit_debug ("sending request with type %d and cookie %" PRIu64, type, + *cookie); + r = write_full (h->fd, &req, sizeof req); + if (r < 0) + h->dead = true; + return r; +} + +static int nbd_reply (struct handle *h, uint64_t cookie) +{ + str...

...sfer_request(struct crypto_engine *engine, + struct crypto_async_request *req, bool need_pump) { unsigned long flags; int ret; - spin_lock_irqsave(&engine->queue_lock, flags); - - if (!engine->running) { - spin_unlock_irqrestore(&engine->queue_lock, flags); - return -ESHUTDOWN; - } - - ret = ablkcipher_enqueue_request(&engine->queue, req); - - if (!engine->busy && need_pump) - kthread_queue_work(engine->kworker, &engine->pump_requests); - - spin_unlock_irqrestore(&engine->queue_lock, flags); - return ret; -} -EXPORT_SYMBOL_GPL(crypto_t...

...r() and nbdkit.debug() callable from Python (so that we have a more complete binding of all the utility functions that C plugins can use); this can be used as a starting point for that. Eric Blake (6): file: Optimize writing zeroes without holes protocol: Map EROFS to EPERM protocol: Support ESHUTDOWN error plugins: Add new nbdkit_set_error() utility function python: Expose nbdkit_set_error to python script python: Support zero callback docs/nbdkit-plugin.pod | 16 +++++++-- include/nbdkit-plugin.h | 3 +- plugins/file/file.c | 19 +++...