diff options
author | Simon Rettberg | 2018-04-10 15:23:34 +0200 |
---|---|---|
committer | Simon Rettberg | 2018-04-10 15:23:34 +0200 |
commit | 5683557d4393162aa477bada1777f645009d75a4 (patch) | |
tree | 5900afdd19c85d0ed2dddd60dc6967853f9700c8 /src | |
parent | [SERVER] Ignore SIGPIPE (diff) | |
download | dnbd3-5683557d4393162aa477bada1777f645009d75a4.tar.gz dnbd3-5683557d4393162aa477bada1777f645009d75a4.tar.xz dnbd3-5683557d4393162aa477bada1777f645009d75a4.zip |
[SERVER] More error handling and logging when caching received data to disk
Diffstat (limited to 'src')
-rw-r--r-- | src/server/uplink.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/server/uplink.c b/src/server/uplink.c index b166c6d..2cf8b7d 100644 --- a/src/server/uplink.c +++ b/src/server/uplink.c @@ -592,24 +592,33 @@ static void uplink_handleReceive(dnbd3_connection_t *link) spin_unlock( &link->image->lock ); // 1) Write to cache file if ( link->image->cacheFd != -1 ) { + int err = 0; bool tryFree = true; uint32_t done = 0; + ret = 0; while ( done < inReply.size ) { ret = (int)pwrite( link->image->cacheFd, link->recvBuffer + done, inReply.size - done, start + done ); if ( ret == -1 ) { - if ( errno == EINTR ) continue; - if ( errno == ENOSPC || errno == EDQUOT ) { + err = errno; + if ( err == EINTR ) continue; + if ( err == ENOSPC || err == EDQUOT ) { // try to free 256MiB if ( !tryFree || !image_ensureDiskSpaceLocked( 256ull * 1024 * 1024, true ) ) break; tryFree = false; continue; // Success, retry write } + logadd( LOG_DEBUG1, "Error trying to cache data for %s:%d -- errno=%d", link->image->name, (int)link->image->rid, err ); + break; + } + if ( ret <= 0 || (uint32_t)ret > inReply.size - done ) { + logadd( LOG_WARNING, "Unexpected return value %d from pwrite to %s:%d", ret, link->image->name, (int)link->image->rid ); + break; } - if ( ret <= 0 ) break; done += (uint32_t)ret; } if ( done > 0 ) image_updateCachemap( link->image, start, start + done, true ); - if ( ret == -1 && ( errno == EBADF || errno == EINVAL || errno == EIO ) ) { + if ( ret == -1 && ( err == EBADF || err == EINVAL || err == EIO ) ) { + // Only disable caching if something seems severely wrong, not on ENOSPC since that might get better logadd( LOG_WARNING, "Error writing received data for %s:%d; disabling caching.", link->image->name, (int)link->image->rid ); const int fd = link->image->cacheFd; |