Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

curvefs/client: fix client release read data cache core dump #1090

Merged
merged 1 commit into from
Feb 18, 2022
Merged

curvefs/client: fix client release read data cache core dump #1090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions curvefs/src/client/s3/client_s3_cache_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,17 @@ void FsCacheManager::Get(std::list<DataCachePtr>::iterator iter) {
lruReadDataCacheList_, iter);
}

void FsCacheManager::Delete(std::list<DataCachePtr>::iterator iter) {
bool FsCacheManager::Delete(std::list<DataCachePtr>::iterator iter) {
std::lock_guard<std::mutex> lk(lruMtx_);

if (!(*iter)->InReadCache()) {
return;
return false;
}

(*iter)->SetReadCacheState(false);
lruByte_ -= (*iter)->GetActualLen();
lruReadDataCacheList_.erase(iter);
return true;
}

CURVEFS_ERROR FsCacheManager::FsSync(bool force) {
Expand Down Expand Up @@ -1249,8 +1250,9 @@ void ChunkCacheManager::AddReadDataCache(DataCachePtr dataCache) {
for (auto key : deleteKeyVec) {
auto iter = dataRCacheMap_.find(key);
std::list<DataCachePtr>::iterator dcpIter = iter->second;
s3ClientAdaptor_->GetFsCacheManager()->Delete(dcpIter);
dataRCacheMap_.erase(iter);
if (s3ClientAdaptor_->GetFsCacheManager()->Delete(dcpIter)) {
dataRCacheMap_.erase(iter);
}
}
std::list<DataCachePtr>::iterator outIter;
bool ret =
Expand Down Expand Up @@ -1287,9 +1289,10 @@ void ChunkCacheManager::ReleaseCache() {
WriteLockGuard writeLockGuard(rwLockRead_);
auto iter = dataRCacheMap_.begin();
for (; iter != dataRCacheMap_.end(); iter++) {
s3ClientAdaptor_->GetFsCacheManager()->Delete(iter->second);
if (s3ClientAdaptor_->GetFsCacheManager()->Delete(iter->second)) {
dataRCacheMap_.erase(iter);
}
}
dataRCacheMap_.clear();
}

void ChunkCacheManager::TruncateCache(uint64_t chunkPos) {
Expand Down Expand Up @@ -1331,8 +1334,9 @@ void ChunkCacheManager::TruncateReadCache(uint64_t chunkPos) {
uint64_t dcLen = (*rIter->second)->GetLen();
uint64_t dcActualLen = (*rIter->second)->GetActualLen();
if ((dcChunkPos + dcLen) > chunkPos) {
s3ClientAdaptor_->GetFsCacheManager()->Delete(rIter->second);
dataRCacheMap_.erase(next(rIter).base());
if (s3ClientAdaptor_->GetFsCacheManager()->Delete(rIter->second)) {
dataRCacheMap_.erase(next(rIter).base());
}
} else {
break;
}
Expand Down
2 changes: 1 addition & 1 deletion curvefs/src/client/s3/client_s3_cache_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ class FsCacheManager {

bool Set(DataCachePtr dataCache,
std::list<DataCachePtr>::iterator *outIter);
void Delete(std::list<DataCachePtr>::iterator iter);
bool Delete(std::list<DataCachePtr>::iterator iter);
void Get(std::list<DataCachePtr>::iterator iter);

CURVEFS_ERROR FsSync(bool force);
Expand Down