Skip to content

Commit

Permalink
curvefs: fix a compatible which caused by modify FsFileType
Browse files Browse the repository at this point in the history
  • Loading branch information
@wu-hanqing
wu-hanqing committed Apr 26, 2022
1 parent 8dd5012 commit 8f16eeb
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 20 deletions.
9 changes: 4 additions & 5 deletions curvefs/proto/metaserver.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,10 @@ message GetInodeRequest {
}

enum FsFileType {
TYPE_DIRECTORY = 1; // 1 << 0
TYPE_FILE = 2; // 1 << 1
TYPE_SYM_LINK = 4; // 1 << 2
TYPE_S3 = 18; // (1 << 4) | TYPE_FILE
TYPE_VOLUME = 34; // (1 << 5) | TYPE_FILE
TYPE_DIRECTORY = 1;
TYPE_FILE = 2;
TYPE_SYM_LINK = 3;
TYPE_S3 = 4;
};

message VolumeExtent {
Expand Down
4 changes: 2 additions & 2 deletions curvefs/src/client/fuse_volume_client.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ CURVEFS_ERROR FuseVolumeClient::FuseOpCreate(fuse_req_t req, fuse_ino_t parent,
<< ", name: " << name
<< ", mode: " << mode;
CURVEFS_ERROR ret =
MakeNode(req, parent, name, mode, FsFileType::TYPE_VOLUME, 0, e);
MakeNode(req, parent, name, mode, FsFileType::TYPE_FILE, 0, e);
if (ret != CURVEFS_ERROR::OK) {
return ret;
}
Expand All @@ -236,7 +236,7 @@ CURVEFS_ERROR FuseVolumeClient::FuseOpMkNod(fuse_req_t req, fuse_ino_t parent,
dev_t rdev, fuse_entry_param *e) {
VLOG(3) << "FuseOpMkNod, parent: " << parent << ", name: " << name
<< ", mode: " << mode << ", rdev: " << rdev;
return MakeNode(req, parent, name, mode, FsFileType::TYPE_VOLUME, rdev, e);
return MakeNode(req, parent, name, mode, FsFileType::TYPE_FILE, rdev, e);
}

CURVEFS_ERROR FuseVolumeClient::FuseOpFsync(fuse_req_t req, fuse_ino_t ino,
Expand Down
6 changes: 3 additions & 3 deletions curvefs/src/client/inode_wrapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ void InodeWrapper::FlushAttrAsync() {
if (dirty_) {
LockSyncingInode();

if (inode_.type() == FsFileType::TYPE_VOLUME) {
if (inode_.type() == FsFileType::TYPE_FILE) {
auto tmp = extentCache_.ToInodePb();
inode_.mutable_volumeextentmap()->swap(tmp);
}
Expand Down Expand Up @@ -455,7 +455,7 @@ static std::ostream &operator<<(
}

void InodeWrapper::BuildExtentCache() {
if (inode_.type() != FsFileType::TYPE_VOLUME) {
if (inode_.type() != FsFileType::TYPE_FILE) {
return;
}

Expand All @@ -465,7 +465,7 @@ void InodeWrapper::BuildExtentCache() {
}

void InodeWrapper::AddVolumeExtentMapToInode() {
if (inode_.type() != FsFileType::TYPE_VOLUME) {
if (inode_.type() != FsFileType::TYPE_FILE) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion curvefs/src/client/inode_wrapper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ class InodeWrapper : public std::enable_shared_from_this<InodeWrapper> {
return SyncS3ChunkInfo();
}

case FsFileType::TYPE_VOLUME: {
case FsFileType::TYPE_FILE: {
return SyncFullInode();
}

Expand Down
4 changes: 2 additions & 2 deletions curvefs/test/client/test_fuse_client.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1166,7 +1166,7 @@ TEST_F(TestFuseVolumeClient, FuseOpSetAttr) {
Inode inode;
inode.set_inodeid(ino);
inode.set_length(0);
inode.set_type(FsFileType::TYPE_VOLUME);
inode.set_type(FsFileType::TYPE_FILE);
auto inodeWrapper = std::make_shared<InodeWrapper>(inode, metaClient_);

EXPECT_CALL(*inodeManager_, GetInode(ino, _))
Expand Down Expand Up @@ -1212,7 +1212,7 @@ TEST_F(TestFuseVolumeClient, FuseOpSetAttrFailed) {
Inode inode;
inode.set_inodeid(ino);
inode.set_length(0);
inode.set_type(FsFileType::TYPE_VOLUME);
inode.set_type(FsFileType::TYPE_FILE);
auto inodeWrapper = std::make_shared<InodeWrapper>(inode, metaClient_);

EXPECT_CALL(*inodeManager_, GetInode(ino, _))
Expand Down
2 changes: 1 addition & 1 deletion curvefs/test/client/test_inodeWrapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ MATCHER(HasVolumeExtentMap, "") {
}

TEST_F(TestInodeWrapper, TestAllUpdateInodeMustHasVolumeExtentMap) {
inodeWrapper_->SetType(FsFileType::TYPE_VOLUME);
inodeWrapper_->SetType(FsFileType::TYPE_FILE);

// Sync
{
Expand Down
12 changes: 6 additions & 6 deletions curvefs/test/client/volume/default_volume_storage_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ TEST_F(DefaultVolumeStorageTest, WriteAndReadTest_InodeNotFound) {

TEST_F(DefaultVolumeStorageTest, ReadTest_BlockDevReadError) {
Inode inode;
inode.set_type(FsFileType::TYPE_VOLUME);
inode.set_type(FsFileType::TYPE_FILE);

VolumeExtentList exts;
auto* ext = exts.add_volumeextents();
Expand Down Expand Up @@ -109,7 +109,7 @@ TEST_F(DefaultVolumeStorageTest, ReadTest_BlockDevReadError) {
TEST_F(DefaultVolumeStorageTest, ReadTest_BlockDevReadSuccess) {
Inode inode;
VolumeExtentList exts;
inode.set_type(FsFileType::TYPE_VOLUME);
inode.set_type(FsFileType::TYPE_FILE);

auto* ext = exts.add_volumeextents();
ext->set_fsoffset(0);
Expand Down Expand Up @@ -144,7 +144,7 @@ TEST_F(DefaultVolumeStorageTest, ReadTest_BlockDevReadSuccess) {
TEST_F(DefaultVolumeStorageTest, ReadTest_BlockDevReadHoleSuccess) {
Inode inode;
VolumeExtentList exts;
inode.set_type(FsFileType::TYPE_VOLUME);
inode.set_type(FsFileType::TYPE_FILE);

auto* ext = exts.add_volumeextents();
ext->set_fsoffset(0);
Expand Down Expand Up @@ -184,7 +184,7 @@ TEST_F(DefaultVolumeStorageTest, ReadTest_BlockDevReadHoleSuccess) {

TEST_F(DefaultVolumeStorageTest, WriteTest_PrepareError) {
Inode inode;
inode.set_type(FsFileType::TYPE_VOLUME);
inode.set_type(FsFileType::TYPE_FILE);

auto inodeWrapper = std::make_shared<InodeWrapper>(inode, metaServerCli_);

Expand All @@ -207,7 +207,7 @@ TEST_F(DefaultVolumeStorageTest, WriteTest_PrepareError) {

TEST_F(DefaultVolumeStorageTest, WriteTest_BlockDevWriteError) {
Inode inode;
inode.set_type(FsFileType::TYPE_VOLUME);
inode.set_type(FsFileType::TYPE_FILE);

auto inodeWrapper = std::make_shared<InodeWrapper>(inode, metaServerCli_);

Expand Down Expand Up @@ -241,7 +241,7 @@ TEST_F(DefaultVolumeStorageTest, WriteTest_BlockDevWriteError) {

TEST_F(DefaultVolumeStorageTest, WriteTest_BlockDevWriteSuccess) {
Inode inode;
inode.set_type(FsFileType::TYPE_VOLUME);
inode.set_type(FsFileType::TYPE_FILE);

auto inodeWrapper = std::make_shared<InodeWrapper>(inode, metaServerCli_);

Expand Down

0 comments on commit 8f16eeb

Please sign in to comment.