]> git.kaiwu.me - nginx.git/commitdiff
Writing to some file systems can be interrupted.
authorValentin Bartenev <vbart@nginx.com>
Wed, 2 Sep 2015 16:26:40 +0000 (19:26 +0300)
committerValentin Bartenev <vbart@nginx.com>
Wed, 2 Sep 2015 16:26:40 +0000 (19:26 +0300)
At least such behavior was observed with CephFS, see:
http://mailman.nginx.org/pipermail/nginx/2015-July/048188.html.

src/os/unix/ngx_files.c

index 2a3ed2f26458e678a66a4868a6e056e63d823970..60b737ff125b3acafbdc2fd94b4509f61a9c047e 100644 (file)
@@ -264,6 +264,7 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
     u_char        *prev;
     size_t         size;
     ssize_t        total, n;
+    ngx_err_t      err;
     ngx_array_t    vec;
     struct iovec  *iov, iovs[NGX_IOVS];
 
@@ -335,10 +336,20 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
             file->sys_offset = offset;
         }
 
+eintr:
+
         n = writev(file->fd, vec.elts, vec.nelts);
 
         if (n == -1) {
-            ngx_log_error(NGX_LOG_CRIT, file->log, ngx_errno,
+            err = ngx_errno;
+
+            if (err == NGX_EINTR) {
+                ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                               "writev() was interrupted");
+                goto eintr;
+            }
+
+            ngx_log_error(NGX_LOG_CRIT, file->log, err,
                           "writev() \"%s\" failed", file->name.data);
             return NGX_ERROR;
         }