youngkingdom/s3fs-fuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve error handling (#2671)

Browse Source 
Found via C++17 [[nodiscard]].
This commit is contained in:
Andrew Gaul
2025-06-07 14:58:06 +09:00
committed by GitHub
parent 0e5bccc20b
commit c869b3996f
4 changed files with 64 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/curl.cpp
View File

@ -1517,7 +1517,9 @@ bool S3fsCurl::CreateCurlHandle(bool remake)
return false;
}
}
ResetHandle();
if(!ResetHandle()){
return false;
}
return true;
}
@ -1653,7 +1655,9 @@ bool S3fsCurl::RemakeHandle()
// reset handle
{
const std::lock_guard<std::mutex> lock(S3fsCurl::curl_handles_lock);
ResetHandle();
if(!ResetHandle()){
return false;
}
}
// set options
@ -2278,7 +2282,9 @@ std::string S3fsCurl::CalcSignature(const std::string& method, const std::string
const auto* cRequest = reinterpret_cast<const unsigned char*>(StringCQ.c_str());
size_t cRequest_len = StringCQ.size();
sha256_t sRequest;
s3fs_sha256(cRequest, cRequest_len, &sRequest);
if(!s3fs_sha256(cRequest, cRequest_len, &sRequest)){
return ""; // TODO: better return value
}
StringToSign = "AWS4-HMAC-SHA256\n";
StringToSign += date8601 + "\n";
@ -2342,7 +2348,9 @@ bool S3fsCurl::insertV4Headers(const std::string& access_key_id, const std::stri
{
size_t cRequest_len = strlen(reinterpret_cast<const char *>(b_postdata));
sha256_t sRequest;
s3fs_sha256(b_postdata, cRequest_len, &sRequest);
if(!s3fs_sha256(b_postdata, cRequest_len, &sRequest)){
return false;
}
payload_hash = s3fs_hex_lower(sRequest.data(), sRequest.size());
break;
}

4
src/fdcache_entity.cpp
View File

@ -662,7 +662,9 @@ bool FdEntity::LoadAll(int fd, off_t* size, bool force_load)
const std::lock_guard<std::mutex> data_lock(fdent_data_lock);
if(force_load){
SetAllStatusUnloaded();
if(!SetAllStatusUnloaded()){
return false;
}
}
//
// TODO: possibly do background for delay loading

47
src/s3fs.cpp
View File

@ -1474,7 +1474,10 @@ static int rename_object(const char* from, const char* to, bool update_ctime)
ent = autoent.Open(from, &meta, buf.st_size, mtime, O_RDONLY, false, true, false);
}
if(ent){
ent->SetMCtime(mtime, ctime);
if(0 != (result = ent->SetMCtime(mtime, ctime))){
S3FS_PRN_ERR("could not set mtime and ctime to file(%s): result=%d", from, result);
return result;
}
ent->SetAtime(atime);
}
}
@ -2469,7 +2472,9 @@ static int s3fs_utimens(const char* _path, const struct timespec ts[2])
// then the meta is pending and accumulated to be put after the upload is complete.
S3FS_PRN_INFO("meta pending until upload is complete");
need_put_header = false;
ent->SetHoldingMtime(mtime);
if(!ent->SetHoldingMtime(mtime)){
return -EIO;
}
// If there is data in the Stats cache, update the Stats cache.
StatCache::getStatCacheData()->UpdateMetaStats(strpath, updatemeta);
@ -2511,7 +2516,9 @@ static int s3fs_utimens(const char* _path, const struct timespec ts[2])
StatCache::getStatCacheData()->DelStat(nowcache);
if(keep_mtime){
ent->SetHoldingMtime(mtime);
if(!ent->SetHoldingMtime(mtime)){
return -EIO;
}
}
}
}
@ -2679,7 +2686,10 @@ static int s3fs_truncate(const char* _path, off_t size)
S3FS_PRN_ERR("could not open file(%s): errno=%d", path, errno);
return -EIO;
}
ent->UpdateCtime();
if(!ent->UpdateCtime()){
S3FS_PRN_ERR("could not update ctime file(%s)", path);
return -EIO;
}
#if defined(__APPLE__)
// [NOTE]
@ -2783,7 +2793,9 @@ static int s3fs_open(const char* _path, struct fuse_file_info* fi)
//
if(nullptr != (ent = autoent.OpenExistFdEntity(path)) && ent->IsModified()){
// sets the file size being edited.
ent->GetSize(st.st_size);
if(!ent->GetSize(st.st_size)){
return -EIO;
}
}
}
if(!S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)){
@ -2806,7 +2818,10 @@ static int s3fs_open(const char* _path, struct fuse_file_info* fi)
struct timespec ts;
s3fs_realtime(ts);
ent->SetMCtime(ts, ts);
if(0 != (result = ent->SetMCtime(ts, ts))){
S3FS_PRN_ERR("could not set mtime and ctime to file(%s): result=%d", path, result);
return result;
}
if(0 != (result = ent->RowFlush(autoent.GetPseudoFd(), path, true))){
S3FS_PRN_ERR("could not upload file(%s): result=%d", path, result);
@ -2936,8 +2951,14 @@ static int s3fs_flush(const char* _path, struct fuse_file_info* fi)
if(nullptr != (ent = autoent.GetExistFdEntity(path, static_cast<int>(fi->fh)))){
bool is_new_file = ent->IsDirtyNewFile();
ent->UpdateMtime(true); // clear the flag not to update mtime.
ent->UpdateCtime();
if(!ent->UpdateMtime()){ // clear the flag not to update mtime.
S3FS_PRN_ERR("could not update mtime file(%s)", path);
return -EIO;
}
if(!ent->UpdateCtime()){
S3FS_PRN_ERR("could not update ctime file(%s)", path);
return -EIO;
}
result = ent->Flush(static_cast<int>(fi->fh), false);
StatCache::getStatCacheData()->DelStat(path);
@ -2970,8 +2991,14 @@ static int s3fs_fsync(const char* _path, int datasync, struct fuse_file_info* fi
bool is_new_file = ent->IsDirtyNewFile();
if(0 == datasync){
ent->UpdateMtime();
ent->UpdateCtime();
if(!ent->UpdateMtime()){
S3FS_PRN_ERR("could not update mtime file(%s)", path);
return -EIO;
}
if(!ent->UpdateCtime()){
S3FS_PRN_ERR("could not update ctime file(%s)", path);
return -EIO;
}
}
result = ent->Flush(static_cast<int>(fi->fh), false);

15
src/s3fs_threadreqs.cpp
View File

@ -86,7 +86,10 @@ void* multi_head_req_threadworker(S3fsCurl& s3fscurl, void* arg)
bool isResetOffset= true;
CURLcode curlCode = s3fscurl.GetCurlCode();
long responseCode = S3fsCurl::S3FSCURL_RESPONSECODE_NOTSET;
s3fscurl.GetResponseCode(responseCode, false);
if(!s3fscurl.GetResponseCode(responseCode, false)){
result = -EIO;
break;
}
if(CURLE_OK == curlCode){
if(responseCode < 400){
@ -441,7 +444,10 @@ void* multipart_put_head_req_threadworker(S3fsCurl& s3fscurl, void* arg)
bool isResetOffset= true;
CURLcode curlCode = s3fscurl.GetCurlCode();
long responseCode = S3fsCurl::S3FSCURL_RESPONSECODE_NOTSET;
s3fscurl.GetResponseCode(responseCode, false);
if(!s3fscurl.GetResponseCode(responseCode, false)){
result = -EIO;
break;
}
if(CURLE_OK == curlCode){
if(responseCode < 400){
@ -559,7 +565,10 @@ void* parallel_get_object_req_threadworker(S3fsCurl& s3fscurl, void* arg)
bool isResetOffset= true;
CURLcode curlCode = s3fscurl.GetCurlCode();
long responseCode = S3fsCurl::S3FSCURL_RESPONSECODE_NOTSET;
s3fscurl.GetResponseCode(responseCode, false);
if(!s3fscurl.GetResponseCode(responseCode, false)){
result = -EIO;
break;
}
if(CURLE_OK == curlCode){
if(responseCode < 400){