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: fix trash will delete file data more than once #2938

Merged
merged 1 commit into from
Dec 5, 2023
Merged

curvefs: fix trash will delete file data more than once #2938

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
2 changes: 1 addition & 1 deletion curvefs/proto/metaserver.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ message Inode {
optional uint64 rdev = 16;
// field 17 is left for compatibility
map<uint64, S3ChunkInfoList> s3ChunkInfoMap = 18; // TYPE_S3 only, first is chunk index
optional uint32 dtime = 19;
optional uint64 dtime = 19;
optional uint32 openmpcount = 20; // openmpcount mount points had the file open
map<string, bytes> xattr = 21;
repeated uint64 parent = 22;
Expand Down
50 changes: 17 additions & 33 deletions curvefs/src/metaserver/inode_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,26 +283,31 @@ MetaStatusCode InodeManager::DeleteInode(uint32_t fsId, uint64_t inodeId,
VLOG(6) << "DeleteInode, fsId = " << fsId << ", inodeId = " << inodeId;
NameLockGuard lg(inodeLock_, GetInodeLockName(fsId, inodeId));
InodeAttr attr;
MetaStatusCode retGetAttr =
inodeStorage_->GetAttr(Key4Inode(fsId, inodeId), &attr);
if (retGetAttr != MetaStatusCode::OK) {
VLOG(9) << "GetInodeAttr fail, fsId = " << fsId
<< ", inodeId = " << inodeId
<< ", ret = " << MetaStatusCode_Name(retGetAttr);
auto ret = inodeStorage_->GetAttr(Key4Inode(fsId, inodeId), &attr);
if (ret == MetaStatusCode::NOT_FOUND) {
return MetaStatusCode::OK;
} else if (ret != MetaStatusCode::OK) {
LOG(ERROR) << "GetInodeAttr fail, fsId = " << fsId
<< ", inodeId = " << inodeId
<< ", ret = " << MetaStatusCode_Name(ret);
return ret;
}

MetaStatusCode ret =
inodeStorage_->Delete(Key4Inode(fsId, inodeId), logIndex);
ret = inodeStorage_->Delete(Key4Inode(fsId, inodeId), logIndex);
if (ret != MetaStatusCode::OK) {
LOG(ERROR) << "DeleteInode fail, fsId = " << fsId
<< ", inodeId = " << inodeId
<< ", ret = " << MetaStatusCode_Name(ret);
return ret;
}

if (retGetAttr == MetaStatusCode::OK) {
// if nlink is 0 means this inode is already in trash
if (attr.nlink() != 0) {
// get attr success
--(*type2InodeNum_)[attr.type()];
} else {
// delete trash item
trash_->Remove(inodeId);
}
VLOG(6) << "DeleteInode success, fsId = " << fsId
<< ", inodeId = " << inodeId;
Expand Down Expand Up @@ -353,8 +358,7 @@ MetaStatusCode InodeManager::UpdateInode(const UpdateInodeRequest& request,

if (request.has_nlink()) {
if (old.nlink() != 0 && request.nlink() == 0) {
uint32_t now = TimeUtility::GetTimeofDaySec();
old.set_dtime(now);
old.set_dtime(TimeUtility::GetTimeofDaySec());
needAddTrash = true;
}
VLOG(9) << "update inode nlink, from " << old.nlink() << " to "
Expand All @@ -373,7 +377,6 @@ MetaStatusCode InodeManager::UpdateInode(const UpdateInodeRequest& request,

bool fileNeedDeallocate =
(needAddTrash && (FsFileType::TYPE_FILE == old.type()));
bool s3NeedTrash = (needAddTrash && (FsFileType::TYPE_S3 == old.type()));

std::shared_ptr<storage::StorageTransaction> txn;
if (needUpdate) {
Expand All @@ -388,8 +391,8 @@ MetaStatusCode InodeManager::UpdateInode(const UpdateInodeRequest& request,
}
}

if (s3NeedTrash) {
trash_->Add(old.fsid(), old.inodeid(), old.dtime());
if (needAddTrash) {
trash_->Add(old.inodeid(), old.dtime());
--(*type2InodeNum_)[old.type()];
}

Expand Down Expand Up @@ -610,25 +613,6 @@ MetaStatusCode InodeManager::UpdateInodeWhenCreateOrRemoveSubNode(
return MetaStatusCode::OK;
}

MetaStatusCode InodeManager::InsertInode(const Inode& inode, int64_t logIndex) {
CHECK_APPLIED();
VLOG(6) << "InsertInode, " << inode.ShortDebugString();

// 2. insert inode
MetaStatusCode ret = inodeStorage_->Insert(inode, logIndex);
if (ret != MetaStatusCode::OK) {
LOG(ERROR) << "InsertInode fail, " << inode.ShortDebugString()
<< ", ret = " << MetaStatusCode_Name(ret);
return ret;
}

if (inode.nlink() == 0) {
trash_->Add(inode.fsid(), inode.inodeid(), inode.dtime());
}

return MetaStatusCode::OK;
}

bool InodeManager::GetInodeIdList(std::list<uint64_t>* inodeIdList) {
return inodeStorage_->GetAllInodeId(inodeIdList);
}
Expand Down
2 changes: 0 additions & 2 deletions curvefs/src/metaserver/inode_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ class InodeManager {
MetaStatusCode UpdateInodeWhenCreateOrRemoveSubNode(
const Dentry& dentry, const Time& tm, bool isCreate, int64_t logIndex);

MetaStatusCode InsertInode(const Inode& inode, int64_t logIndex);

bool GetInodeIdList(std::list<uint64_t>* inodeIdList);

// Update one or more volume extent slice
Expand Down
21 changes: 7 additions & 14 deletions curvefs/src/metaserver/partition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ Partition::Partition(PartitionInfo partition,
dentryStorage_ =
std::make_shared<DentryStorage>(kvStorage_, nameGen_, nDentry);

auto trash = std::make_shared<TrashImpl>(inodeStorage_);
auto trash = std::make_shared<TrashImpl>(inodeStorage_,
partitionInfo_.fsid(), partitionInfo_.poolid(),
partitionInfo_.copysetid(), partitionInfo_.partitionid());
inodeManager_ = std::make_shared<InodeManager>(
inodeStorage_, trash, partitionInfo_.mutable_filetype2inodenum());
txManager_ = std::make_shared<TxManager>(dentryStorage_, partitionInfo_);
Expand Down Expand Up @@ -359,15 +361,6 @@ MetaStatusCode Partition::PaddingInodeS3ChunkInfo(int32_t fsId,
return inodeManager_->PaddingInodeS3ChunkInfo(fsId, inodeId, m, limit);
}

MetaStatusCode Partition::InsertInode(const Inode& inode, int64_t logIndex) {
PRECHECK(inode.fsid(), inode.inodeid());
auto ret = inodeManager_->InsertInode(inode, logIndex);
if (ret == MetaStatusCode::IDEMPOTENCE_OK) {
ret = MetaStatusCode::OK;
}
return ret;
}

bool Partition::GetInodeIdList(std::list<uint64_t>* InodeIdList) {
return inodeManager_->GetInodeIdList(InodeIdList);
}
Expand Down Expand Up @@ -470,12 +463,12 @@ uint64_t Partition::GetNewInodeId() {
return newInodeId;
}

uint32_t Partition::GetInodeNum() {
return static_cast<uint32_t>(inodeStorage_->Size());
uint64_t Partition::GetInodeNum() {
return inodeStorage_->Size();
}

uint32_t Partition::GetDentryNum() {
return static_cast<uint32_t>(dentryStorage_->Size());
uint64_t Partition::GetDentryNum() {
return dentryStorage_->Size();
}

bool Partition::EmptyInodeStorage() { return inodeStorage_->Empty(); }
Expand Down
6 changes: 2 additions & 4 deletions curvefs/src/metaserver/partition.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ class Partition {
virtual MetaStatusCode GetAllBlockGroup(
std::vector<DeallocatableBlockGroup>* deallocatableBlockGroupVec);

MetaStatusCode InsertInode(const Inode& inode, int64_t logIndex);

bool GetInodeIdList(std::list<uint64_t>* InodeIdList);

// if partition has no inode or no dentry, it is deletable
Expand Down Expand Up @@ -167,9 +165,9 @@ class Partition {
// if no available inode id in this partiton ,return UINT64_MAX
uint64_t GetNewInodeId();

uint32_t GetInodeNum();
uint64_t GetInodeNum();

uint32_t GetDentryNum();
uint64_t GetDentryNum();

bool EmptyInodeStorage();

Expand Down
Loading