Skip to content

Commit f64f561

Browse files
201341201341
committed
[feat]: curvefs: merge two rpc into one when delete dentry
Signed-off-by: swj <1186093704@qq.com>
1 parent 7f4a097 commit f64f561

File tree

13 files changed

+60
-95
lines changed

13 files changed

+60
-95
lines changed

‎curvefs/proto/metaserver.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ message DeleteDentryRequest {
131131
required uint64 parentInodeId = 6;
132132
required string name = 7;
133133
optional FsFileType type = 8;
134+
optional Time create = 9;
134135
}
135136

136137
message DeleteDentryResponse {

‎curvefs/src/client/fuse_client.cpp

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -368,35 +368,6 @@ CURVEFS_ERROR FuseClient::FuseOpOpen(fuse_req_t req,
368368
return HandleOpenFlags(req, ino, fi, fileOut);
369369
}
370370

371-
CURVEFS_ERROR FuseClient::UpdateParentMCTimeAndNlink(
372-
fuse_ino_t parent, FsFileType type, NlinkChange nlink) {
373-
374-
std::shared_ptr<InodeWrapper> parentInodeWrapper;
375-
auto ret = inodeManager_->GetInode(parent, parentInodeWrapper);
376-
if (ret != CURVEFS_ERROR::OK) {
377-
LOG(ERROR) << "inodeManager get inode fail, ret = " << ret
378-
<< ", inodeid = " << parent;
379-
return ret;
380-
}
381-
382-
{
383-
curve::common::UniqueLock lk = parentInodeWrapper->GetUniqueLock();
384-
parentInodeWrapper->UpdateTimestampLocked(kModifyTime | kChangeTime);
385-
386-
if (FsFileType::TYPE_DIRECTORY == type) {
387-
parentInodeWrapper->UpdateNlinkLocked(nlink);
388-
}
389-
390-
if (option_.fileSystemOption.deferSyncOption.deferDirMtime) {
391-
inodeManager_->ShipToFlush(parentInodeWrapper);
392-
} else {
393-
return parentInodeWrapper->SyncAttr();
394-
}
395-
}
396-
397-
return CURVEFS_ERROR::OK;
398-
}
399-
400371
CURVEFS_ERROR FuseClient::MakeNode(
401372
fuse_req_t req,
402373
fuse_ino_t parent,
@@ -535,15 +506,6 @@ CURVEFS_ERROR FuseClient::DeleteNode(uint64_t ino, fuse_ino_t parent,
535506
return ret;
536507
}
537508

538-
ret = UpdateParentMCTimeAndNlink(parent, type, NlinkChange::kSubOne);
539-
if (ret != CURVEFS_ERROR::OK) {
540-
LOG(ERROR) << "UpdateParentMCTimeAndNlink failed"
541-
<< ", parent: " << parent
542-
<< ", name: " << name
543-
<< ", type: " << type;
544-
return ret;
545-
}
546-
547509
std::shared_ptr<InodeWrapper> inodeWrapper;
548510
ret = inodeManager_->GetInode(ino, inodeWrapper);
549511
if (ret != CURVEFS_ERROR::OK) {

‎curvefs/src/client/fuse_client.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,6 @@ class FuseClient {
415415
private:
416416
virtual void FlushData() = 0;
417417

418-
CURVEFS_ERROR UpdateParentMCTimeAndNlink(
419-
fuse_ino_t parent, FsFileType type, NlinkChange nlink);
420-
421418
std::string GenerateNewRecycleName(fuse_ino_t ino,
422419
fuse_ino_t parent, const char* name) {
423420
std::string newName(name);

‎curvefs/src/client/rpcclient/metaserver_client.cpp

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,15 @@ class MetaServerClientRpcDoneBase : public google::protobuf::Closure {
107107
MetaServerClientMetric *metric_;
108108
};
109109

110+
Time* MetaServerClientImpl::CreateTime() {
111+
struct timespec now;
112+
clock_gettime(CLOCK_REALTIME, &now);
113+
Time* tm = new Time();
114+
tm->set_sec(now.tv_sec);
115+
tm->set_nsec(now.tv_nsec);
116+
return tm;
117+
}
118+
110119
MetaStatusCode MetaServerClientImpl::GetTxId(uint32_t fsId, uint64_t inodeId,
111120
uint32_t *partitionId,
112121
uint64_t *txId) {
@@ -255,12 +264,7 @@ MetaStatusCode MetaServerClientImpl::CreateDentry(const Dentry &dentry) {
255264
d->set_txid(txId);
256265
d->set_type(dentry.type());
257266
request.set_allocated_dentry(d);
258-
struct timespec now;
259-
clock_gettime(CLOCK_REALTIME, &now);
260-
Time *tm = new Time();
261-
tm->set_sec(now.tv_sec);
262-
tm->set_nsec(now.tv_nsec);
263-
request.set_allocated_create(tm);
267+
request.set_allocated_create(CreateTime());
264268
curvefs::metaserver::MetaServerService_Stub stub(channel);
265269
stub.CreateDentry(cntl, &request, &response, nullptr);
266270

@@ -321,7 +325,7 @@ MetaStatusCode MetaServerClientImpl::DeleteDentry(uint32_t fsId,
321325
request.set_name(name);
322326
request.set_txid(txId);
323327
request.set_type(type);
324-
328+
request.set_allocated_create(CreateTime());
325329
curvefs::metaserver::MetaServerService_Stub stub(channel);
326330
stub.DeleteDentry(cntl, &request, &response, nullptr);
327331

@@ -1147,12 +1151,7 @@ MetaStatusCode MetaServerClientImpl::CreateInode(const InodeParam &param,
11471151
request.set_rdev(param.rdev);
11481152
request.set_symlink(param.symlink);
11491153
request.set_parent(param.parent);
1150-
struct timespec now;
1151-
clock_gettime(CLOCK_REALTIME, &now);
1152-
Time *tm = new Time();
1153-
tm->set_sec(now.tv_sec);
1154-
tm->set_nsec(now.tv_nsec);
1155-
request.set_allocated_create(tm);
1154+
request.set_allocated_create(CreateTime());
11561155
curvefs::metaserver::MetaServerService_Stub stub(channel);
11571156
stub.CreateInode(cntl, &request, &response, nullptr);
11581157

‎curvefs/src/client/rpcclient/metaserver_client.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,8 @@ class MetaServerClientImpl : public MetaServerClient {
298298

299299
bool HandleS3MetaStreamBuffer(butil::IOBuf* buffer, S3ChunkInfoMap* out);
300300

301+
Time* CreateTime();
302+
301303
private:
302304
ExcutorOpt opt_;
303305
ExcutorOpt optInternal_;

‎curvefs/src/metaserver/inode_manager.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,10 +541,11 @@ MetaStatusCode InodeManager::PaddingInodeS3ChunkInfo(int32_t fsId,
541541
}
542542

543543
MetaStatusCode InodeManager::UpdateInodeWhenCreateOrRemoveSubNode(
544-
const Dentry& dentry, uint64_t now, uint32_t now_ns, bool isCreate,
545-
int64_t logIndex) {
544+
const Dentry& dentry, const Time& tm, bool isCreate, int64_t logIndex) {
546545
uint64_t fsId = dentry.fsid();
547546
uint64_t parentInodeId = dentry.parentinodeid();
547+
uint64_t now = tm.sec();
548+
uint32_t now_ns = tm.nsec();
548549
FsFileType type = dentry.type();
549550
MetaStatusCode ret = MetaStatusCode::OK;
550551

‎curvefs/src/metaserver/inode_manager.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,8 @@ class InodeManager {
105105
S3ChunkInfoMap* m,
106106
uint64_t limit = 0);
107107

108-
MetaStatusCode UpdateInodeWhenCreateOrRemoveSubNode(const Dentry& dentry,
109-
uint64_t now,
110-
uint32_t now_ns,
111-
bool isCreate,
112-
int64_t logIndex);
108+
MetaStatusCode UpdateInodeWhenCreateOrRemoveSubNode(
109+
const Dentry& dentry, const Time& tm, bool isCreate, int64_t logIndex);
113110

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

‎curvefs/src/metaserver/metastore.cpp

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,15 @@ std::shared_ptr<StreamServer> MetaStoreImpl::GetStreamServer() {
358358
return status; \
359359
}
360360

361+
#define GET_TIME_FROM_REQUEST(TIME) \
362+
uint64_t now = 0; \
363+
uint32_t now_ns = 0; \
364+
if (request->has_create()) { \
365+
now = request->create().sec(); \
366+
now_ns = request->create().nsec(); \
367+
} \
368+
TIME.set_sec(now); \
369+
TIME.set_nsec(now_ns);
361370

362371
// dentry
363372
MetaStatusCode MetaStoreImpl::CreateDentry(const CreateDentryRequest* request,
@@ -366,15 +375,8 @@ MetaStatusCode MetaStoreImpl::CreateDentry(const CreateDentryRequest* request,
366375
ReadLockGuard readLockGuard(rwLock_);
367376
std::shared_ptr<Partition> partition;
368377
GET_PARTITION_OR_RETURN(partition);
369-
uint64_t now = 0;
370-
uint32_t now_ns = 0;
371-
if (request->has_create()) {
372-
now = request->create().sec();
373-
now_ns = request->create().nsec();
374-
}
375378
Time tm;
376-
tm.set_sec(now);
377-
tm.set_nsec(now_ns);
379+
GET_TIME_FROM_REQUEST(tm);
378380
MetaStatusCode status =
379381
partition->CreateDentry(request->dentry(), tm, logIndex);
380382
response->set_statuscode(status);
@@ -428,7 +430,9 @@ MetaStatusCode MetaStoreImpl::DeleteDentry(const DeleteDentryRequest* request,
428430
dentry.set_txid(txId);
429431
dentry.set_type(request->type());
430432

431-
auto rc = partition->DeleteDentry(dentry, logIndex);
433+
Time tm;
434+
GET_TIME_FROM_REQUEST(tm);
435+
auto rc = partition->DeleteDentry(dentry, tm, logIndex);
432436
response->set_statuscode(rc);
433437
return rc;
434438
}

‎curvefs/src/metaserver/partition.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ MetaStatusCode Partition::CreateDentry(const Dentry& dentry, const Time& tm,
117117
if (MetaStatusCode::OK == ret) {
118118
if (dentry.has_type()) {
119119
return inodeManager_->UpdateInodeWhenCreateOrRemoveSubNode(
120-
dentry, tm.sec(), tm.nsec(), true, logIndex);
120+
dentry, tm, true, logIndex);
121121
} else {
122122
LOG(ERROR) << "CreateDentry does not have type, "
123123
<< dentry.ShortDebugString();
@@ -128,7 +128,7 @@ MetaStatusCode Partition::CreateDentry(const Dentry& dentry, const Time& tm,
128128
// NOTE: we enter here means that
129129
// this log maybe is "half apply"
130130
ret = inodeManager_->UpdateInodeWhenCreateOrRemoveSubNode(
131-
dentry, tm.sec(), tm.nsec(), true, logIndex);
131+
dentry, tm, true, logIndex);
132132
if (ret == MetaStatusCode::IDEMPOTENCE_OK) {
133133
ret = MetaStatusCode::OK;
134134
}
@@ -155,14 +155,15 @@ MetaStatusCode Partition::LoadDentry(const DentryVec& vec, bool merge,
155155
return rc;
156156
}
157157

158-
MetaStatusCode Partition::DeleteDentry(const Dentry& dentry, int64_t logIndex) {
158+
MetaStatusCode Partition::DeleteDentry(
159+
const Dentry& dentry, const Time& tm, int64_t logIndex) {
159160
PRECHECK(dentry.fsid(), dentry.parentinodeid());
160161

161162
MetaStatusCode ret = dentryManager_->DeleteDentry(dentry, logIndex);
162163
if (MetaStatusCode::OK == ret) {
163164
if (dentry.has_type()) {
164165
return inodeManager_->UpdateInodeWhenCreateOrRemoveSubNode(
165-
dentry, 0, 0, false, logIndex);
166+
dentry, tm, false, logIndex);
166167
} else {
167168
LOG(ERROR) << "DeleteDentry does not have type, "
168169
<< dentry.ShortDebugString();
@@ -173,7 +174,7 @@ MetaStatusCode Partition::DeleteDentry(const Dentry& dentry, int64_t logIndex) {
173174
// NOTE: we enter here means that
174175
// this log maybe is "half apply"
175176
ret = inodeManager_->UpdateInodeWhenCreateOrRemoveSubNode(
176-
dentry, 0, 0, false, logIndex);
177+
dentry, tm, false, logIndex);
177178
}
178179
if (ret == MetaStatusCode::IDEMPOTENCE_OK) {
179180
ret = MetaStatusCode::OK;

‎curvefs/src/metaserver/partition.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,14 @@ class Partition {
5858
Partition() = default;
5959

6060
// dentry
61-
MetaStatusCode CreateDentry(const Dentry& dentry, const Time& tm,
62-
int64_t logIndex);
61+
MetaStatusCode CreateDentry(
62+
const Dentry& dentry, const Time& tm, int64_t logIndex);
6363

64-
MetaStatusCode LoadDentry(const DentryVec& vec, bool merge,
65-
int64_t logIndex);
64+
MetaStatusCode LoadDentry(
65+
const DentryVec& vec, bool merge, int64_t logIndex);
6666

67-
MetaStatusCode DeleteDentry(const Dentry& dentry, int64_t logIndex);
67+
MetaStatusCode DeleteDentry(
68+
const Dentry& dentry, const Time& tm, int64_t logIndex);
6869

6970
MetaStatusCode GetDentry(Dentry* dentry);
7071

‎curvefs/test/client/test_fuse_s3_client.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3941,8 +3941,6 @@ TEST_F(TestFuseS3Client, FuseOpUnlink_EnableSummary) {
39413941
EXPECT_CALL(*inodeManager_, GetInode(_, _))
39423942
.WillOnce(
39433943
DoAll(SetArgReferee<1>(inodeWrapper), Return(CURVEFS_ERROR::OK)))
3944-
.WillOnce(DoAll(
3945-
SetArgReferee<1>(parentInodeWrapper), Return(CURVEFS_ERROR::OK)))
39463944
.WillOnce(
39473945
DoAll(SetArgReferee<1>(inodeWrapper), Return(CURVEFS_ERROR::OK)))
39483946
.WillOnce(DoAll(
@@ -3952,12 +3950,8 @@ TEST_F(TestFuseS3Client, FuseOpUnlink_EnableSummary) {
39523950
EXPECT_CALL(*metaClient_, UpdateInodeAttr(_, _, _))
39533951
.WillRepeatedly(Return(MetaStatusCode::OK));
39543952

3955-
EXPECT_CALL(*inodeManager_, ShipToFlush(_)).Times(1);
3956-
39573953
CURVEFS_ERROR ret = client_->FuseOpUnlink(req, parent, name.c_str());
39583954
ASSERT_EQ(CURVEFS_ERROR::OK, ret);
3959-
Inode inode2 = inodeWrapper->GetInode();
3960-
ASSERT_EQ(nlink - 1, inode2.nlink());
39613955

39623956
auto p = parentInodeWrapper->GetInode();
39633957
ASSERT_EQ(3, p.nlink());

‎curvefs/test/client/test_fuse_volume_client.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -571,8 +571,6 @@ TEST_F(TestFuseVolumeClient, FuseOpUnlink) {
571571
EXPECT_CALL(*inodeManager_, GetInode(_, _))
572572
.WillOnce(
573573
DoAll(SetArgReferee<1>(inodeWrapper), Return(CURVEFS_ERROR::OK)))
574-
.WillOnce(DoAll(
575-
SetArgReferee<1>(parentInodeWrapper), Return(CURVEFS_ERROR::OK)))
576574
.WillOnce(
577575
DoAll(SetArgReferee<1>(inodeWrapper), Return(CURVEFS_ERROR::OK)));
578576
EXPECT_CALL(*metaClient_, GetInodeAttr(_, _, _))
@@ -632,10 +630,13 @@ TEST_F(TestFuseVolumeClient, FuseOpRmDir) {
632630
std::make_shared<InodeWrapper>(parentInode, metaClient_);
633631

634632
EXPECT_CALL(*inodeManager_, GetInode(_, _))
633+
<<<<<<< HEAD
635634
.WillOnce(
636635
DoAll(SetArgReferee<1>(inodeWrapper), Return(CURVEFS_ERROR::OK)))
637636
.WillOnce(DoAll(
638637
SetArgReferee<1>(parentInodeWrapper), Return(CURVEFS_ERROR::OK)))
638+
=======
639+
>>>>>>> 147109eb ([feat]: curvefs: merge two rpc into one when delete dentry)
639640
.WillOnce(
640641
DoAll(SetArgReferee<1>(inodeWrapper), Return(CURVEFS_ERROR::OK)));
641642
EXPECT_CALL(*metaClient_, GetInodeAttr(_, _, _))
@@ -699,6 +700,7 @@ TEST_F(TestFuseVolumeClient, FuseOpUnlinkFailed) {
699700
std::make_shared<InodeWrapper>(parentInode, metaClient_);
700701

701702
EXPECT_CALL(*inodeManager_, GetInode(_, _))
703+
<<<<<<< HEAD
702704
.WillOnce(
703705
DoAll(SetArgReferee<1>(inodeWrapper), Return(CURVEFS_ERROR::OK)))
704706
.WillOnce(DoAll(
@@ -708,6 +710,9 @@ TEST_F(TestFuseVolumeClient, FuseOpUnlinkFailed) {
708710
DoAll(SetArgReferee<1>(inodeWrapper), Return(CURVEFS_ERROR::OK)))
709711
.WillOnce(DoAll(
710712
SetArgReferee<1>(parentInodeWrapper), Return(CURVEFS_ERROR::OK)))
713+
=======
714+
.WillOnce(Return(CURVEFS_ERROR::INTERNAL))
715+
>>>>>>> 147109eb ([feat]: curvefs: merge two rpc into one when delete dentry)
711716
.WillOnce(
712717
DoAll(SetArgReferee<1>(inodeWrapper), Return(CURVEFS_ERROR::OK)));
713718
EXPECT_CALL(*metaClient_, GetInodeAttr(_, _, _))

‎curvefs/test/metaserver/partition_test.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -292,11 +292,12 @@ TEST_F(PartitionTest, dentrynum) {
292292
Time tm;
293293
tm.set_sec(0);
294294
tm.set_nsec(0);
295-
ASSERT_EQ(partition1.CreateDentry(dentry, tm, logIndex_++),
296-
MetaStatusCode::OK);
295+
ASSERT_EQ(
296+
partition1.CreateDentry(dentry, tm, logIndex_++), MetaStatusCode::OK);
297297
ASSERT_EQ(partition1.GetDentryNum(), 1);
298298

299-
ASSERT_EQ(partition1.DeleteDentry(dentry, logIndex_++), MetaStatusCode::OK);
299+
ASSERT_EQ(
300+
partition1.DeleteDentry(dentry, tm, logIndex_++), MetaStatusCode::OK);
300301
ASSERT_EQ(partition1.GetDentryNum(), 0);
301302
}
302303

@@ -331,10 +332,10 @@ TEST_F(PartitionTest, PARTITION_ID_MISSMATCH_ERROR) {
331332
MetaStatusCode::PARTITION_ID_MISSMATCH);
332333

333334
// test DeleteDentry
334-
ASSERT_EQ(partition1.DeleteDentry(dentry1, logIndex_++),
335-
MetaStatusCode::PARTITION_ID_MISSMATCH);
336-
ASSERT_EQ(partition1.DeleteDentry(dentry2, logIndex_++),
337-
MetaStatusCode::PARTITION_ID_MISSMATCH);
335+
ASSERT_EQ(partition1.DeleteDentry(dentry1, tm, logIndex_++),
336+
MetaStatusCode::PARTITION_ID_MISSMATCH);
337+
ASSERT_EQ(partition1.DeleteDentry(dentry2, tm, logIndex_++),
338+
MetaStatusCode::PARTITION_ID_MISSMATCH);
338339

339340
// test GetDentry
340341
ASSERT_EQ(partition1.GetDentry(&dentry1),

0 commit comments

Comments
 (0)