mirror of
https://github.com/nginx/nginx.git
synced 2025-06-07 17:52:38 +08:00
Writing to some file systems can be interrupted.
At least such behavior was observed with CephFS, see: http://mailman.nginx.org/pipermail/nginx/2015-July/048188.html.
This commit is contained in:
parent
5e0b936a07
commit
7dd3f9ee22
@ -264,6 +264,7 @@ ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl, off_t offset,
|
|||||||
u_char *prev;
|
u_char *prev;
|
||||||
size_t size;
|
size_t size;
|
||||||
ssize_t total, n;
|
ssize_t total, n;
|
||||||
|
ngx_err_t err;
|
||||||
ngx_array_t vec;
|
ngx_array_t vec;
|
||||||
struct iovec *iov, iovs[NGX_IOVS];
|
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;
|
file->sys_offset = offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
eintr:
|
||||||
|
|
||||||
n = writev(file->fd, vec.elts, vec.nelts);
|
n = writev(file->fd, vec.elts, vec.nelts);
|
||||||
|
|
||||||
if (n == -1) {
|
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);
|
"writev() \"%s\" failed", file->name.data);
|
||||||
return NGX_ERROR;
|
return NGX_ERROR;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user