github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Propagate disk full error on pre-allocation to last error code

pull/857/head
Tatsuhiro Tsujikawa 2017-02-23 21:34:58 +09:00
parent 857d6a2a8e
commit 8fc0c85125
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/AbstractDiskWriter.cc
View File

@ -425,21 +425,29 @@ void AbstractDiskWriter::ensureMmapWrite(size_t len, int64_t offset)
#endif // HAVE_MMAP || __MINGW32__ #endif // HAVE_MMAP || __MINGW32__
} }
namespace {
// Returns true if |errNum| indicates that disk is full.
bool isDiskFullError(int errNum)
{
return
#ifdef __MINGW32__
errNum == ERROR_DISK_FULL || errNum == ERROR_HANDLE_DISK_FULL
#else // !__MINGW32__
errNum == ENOSPC
#endif // !__MINGW32__
;
}
} // namespace
void AbstractDiskWriter::writeData(const unsigned char* data, size_t len, void AbstractDiskWriter::writeData(const unsigned char* data, size_t len,
int64_t offset) int64_t offset)
{ {
ensureMmapWrite(len, offset); ensureMmapWrite(len, offset);
if (writeDataInternal(data, len, offset) < 0) { if (writeDataInternal(data, len, offset) < 0) {
int errNum = fileError(); int errNum = fileError();
if (
// If the error indicates disk full situation, throw // If the error indicates disk full situation, throw
// DownloadFailureException and abort download instantly. // DownloadFailureException and abort download instantly.
#ifdef __MINGW32__ if (isDiskFullError(errNum)) {
errNum == ERROR_DISK_FULL || errNum == ERROR_HANDLE_DISK_FULL
#else // !__MINGW32__
errNum == ENOSPC
#endif // !__MINGW32__
) {
throw DOWNLOAD_FAILURE_EXCEPTION3( throw DOWNLOAD_FAILURE_EXCEPTION3(
errNum, errNum,
fmt(EX_FILE_WRITE, filename_.c_str(), fileStrerror(errNum).c_str()), fmt(EX_FILE_WRITE, filename_.c_str(), fileStrerror(errNum).c_str()),
@ -546,16 +554,19 @@ void AbstractDiskWriter::allocate(int64_t offset, int64_t length, bool sparse)
; ;
int errNum = errno; int errNum = errno;
if (r == -1) { if (r == -1) {
throw DL_ABORT_EX3(errNum, fmt("fallocate failed. cause: %s", throw DL_ABORT_EX3(
util::safeStrerror(errNum).c_str()), errNum,
error_code::FILE_IO_ERROR); fmt("fallocate failed. cause: %s", util::safeStrerror(errNum).c_str()),
isDiskFullError(errNum) ? error_code::NOT_ENOUGH_DISK_SPACE
: error_code::FILE_IO_ERROR);
} }
#elif HAVE_POSIX_FALLOCATE #elif HAVE_POSIX_FALLOCATE
int r = posix_fallocate(fd_, offset, length); int r = posix_fallocate(fd_, offset, length);
if (r != 0) { if (r != 0) {
throw DL_ABORT_EX3(r, fmt("posix_fallocate failed. cause: %s", throw DL_ABORT_EX3(r, fmt("posix_fallocate failed. cause: %s",
util::safeStrerror(r).c_str()), util::safeStrerror(r).c_str()),
error_code::FILE_IO_ERROR); isDiskFullError(r) ? error_code::NOT_ENOUGH_DISK_SPACE
: error_code::FILE_IO_ERROR);
} }
#else #else
#error "no *_fallocate function available." #error "no *_fallocate function available."

1
src/FileAllocationCommand.cc
View File

@ -92,6 +92,7 @@ bool FileAllocationCommand::executeInternal()
bool FileAllocationCommand::handleException(Exception& e) bool FileAllocationCommand::handleException(Exception& e)
{ {
getRequestGroup()->setLastErrorCode(e.getErrorCode(), e.what());
A2_LOG_ERROR_EX(fmt(MSG_FILE_ALLOCATION_FAILURE, getCuid()), e); A2_LOG_ERROR_EX(fmt(MSG_FILE_ALLOCATION_FAILURE, getCuid()), e);
A2_LOG_ERROR( A2_LOG_ERROR(
fmt(MSG_DOWNLOAD_NOT_COMPLETE, getCuid(), fmt(MSG_DOWNLOAD_NOT_COMPLETE, getCuid(),