database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Added error detection to the new ::rename calls.

Browse Source
This commit is contained in:
Patrick LeBlanc
2020-05-22 08:45:28 -04:00
parent c29050899d
commit 43585d55cd
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
storage-manager/src/IOCoordinator.cpp
View File

@ -505,11 +505,21 @@ ssize_t IOCoordinator::_write(const boost::filesystem::path &filename, const uin
dataRemaining -= err; dataRemaining -= err;
count += err; count += err;
iocBytesWritten += err; iocBytesWritten += err;
// get a new name for the object
bf::path oldPath = firstDir/newObject.key; // get a new name for the object
string oldKey = newObject.key;
newObject.key = metadata.getNewKeyFromOldKey(newObject.key, err + objectOffset); newObject.key = metadata.getNewKeyFromOldKey(newObject.key, err + objectOffset);
::rename(oldPath.string().c_str(), (firstDir/newObject.key).string().c_str()); int renameErr = ::rename((firstDir/oldKey).string().c_str(), (firstDir/newObject.key).string().c_str());
int renameErrno = errno;
if (renameErr < 0)
{
ostringstream oss;
char buf[80];
oss << "IOCoordinator::write(): Failed to rename " << (firstDir/oldKey).string() << " to " <<
(firstDir/newObject.key).string() << "! Got " << strerror_r(renameErrno, buf, 80);
logger->log(LOG_ERR, oss.str().c_str());
newObject.key = oldKey;
}
// rename and resize the object in metadata // rename and resize the object in metadata
metadata.updateEntry(newObject.offset, newObject.key, (err + objectOffset)); metadata.updateEntry(newObject.offset, newObject.key, (err + objectOffset));
@ -643,9 +653,20 @@ ssize_t IOCoordinator::append(const char *_filename, const uint8_t *data, size_t
iocBytesWritten += err; iocBytesWritten += err;
if (err < (int64_t) writeLength) if (err < (int64_t) writeLength)
{ {
bf::path oldPath = firstDir/newObject.key; string oldKey = newObject.key;
newObject.key = metadata.getNewKeyFromOldKey(newObject.key, err + newObject.offset); newObject.key = metadata.getNewKeyFromOldKey(newObject.key, err + newObject.offset);
::rename(oldPath.string().c_str(), (firstDir/newObject.key).string().c_str()); int renameErr = ::rename((firstDir/oldKey).string().c_str(), (firstDir/newObject.key).string().c_str());
int renameErrno = errno;
if (renameErr < 0)
{
ostringstream oss;
char buf[80];
oss << "IOCoordinator::write(): Failed to rename " << (firstDir/oldKey).string() << " to " <<
(firstDir/newObject.key).string() << "! Got " << strerror_r(renameErrno, buf, 80);
logger->log(LOG_ERR, oss.str().c_str());
newObject.key = oldKey;
}
metadata.updateEntry(newObject.offset, newObject.key, err + newObject.offset); metadata.updateEntry(newObject.offset, newObject.key, err + newObject.offset);
} }
cache->newObject(firstDir, newObject.key,err); cache->newObject(firstDir, newObject.key,err);