From f3a86f97a190c548c5aba846029191f07794c9bc Mon Sep 17 00:00:00 2001 From: Cyber-SiKu Date: Tue, 28 Dec 2021 11:28:38 +0800 Subject: [PATCH] curvefs/client: rm create fs in init curvefs_tool has add create-fs --- curvefs/src/client/fuse_client.cpp | 12 +++------ curvefs/test/client/test_fuse_client.cpp | 32 ++---------------------- 2 files changed, 5 insertions(+), 39 deletions(-) diff --git a/curvefs/src/client/fuse_client.cpp b/curvefs/src/client/fuse_client.cpp index a07059e163..6cc8bea4bf 100644 --- a/curvefs/src/client/fuse_client.cpp +++ b/curvefs/src/client/fuse_client.cpp @@ -151,15 +151,9 @@ CURVEFS_ERROR FuseClient::FuseOpInit(void *userdata, FSStatusCode ret = mdsClient_->GetFsInfo(fsName, &fsInfo); if (ret != FSStatusCode::OK) { if (FSStatusCode::NOT_FOUND == ret) { - LOG(INFO) << "The fsName not exist, try to CreateFs" - << ", fsName = " << fsName; - - CURVEFS_ERROR ret2 = CreateFs(userdata, &fsInfo); - if (ret2 != CURVEFS_ERROR::OK) { - LOG(ERROR) << "CreateFs failed, ret = " << ret2 - << ", fsName = " << fsName; - return ret2; - } + LOG(ERROR) << "The fsName not exist, try to CreateFs" + << ", fsName = " << fsName; + return CURVEFS_ERROR::NOTEXIST; } else { LOG(ERROR) << "GetFsInfo failed, FSStatusCode = " << ret << ", FSStatusCode_Name = " diff --git a/curvefs/test/client/test_fuse_client.cpp b/curvefs/test/client/test_fuse_client.cpp index 1f4bfc5bbd..7a208574c3 100644 --- a/curvefs/test/client/test_fuse_client.cpp +++ b/curvefs/test/client/test_fuse_client.cpp @@ -188,29 +188,12 @@ TEST_F(TestFuseVolumeClient, FuseOpInit_when_fs_not_exist) { EXPECT_CALL(*mdsClient_, GetFsInfo(fsName, _)) .WillOnce(Return(FSStatusCode::NOT_FOUND)); - EXPECT_CALL(*blockDeviceClient_, Stat(volName, user, _)) - .WillOnce(Return(CURVEFS_ERROR::OK)); - - EXPECT_CALL(*mdsClient_, CreateFs(_, _, _)) - .WillOnce(Return(FSStatusCode::OK)); - FsInfo fsInfoExp; fsInfoExp.set_fsid(100); fsInfoExp.set_fsname(fsName); - EXPECT_CALL(*mdsClient_, MountFs(fsName, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(fsInfoExp), Return(FSStatusCode::OK))); - - EXPECT_CALL(*blockDeviceClient_, Open(volName, user)) - .WillOnce(Return(CURVEFS_ERROR::OK)); CURVEFS_ERROR ret = client_->FuseOpInit(&mOpts, nullptr); - ASSERT_EQ(CURVEFS_ERROR::OK, ret); - - auto fsInfo = client_->GetFsInfo(); - ASSERT_NE(fsInfo, nullptr); - - ASSERT_EQ(fsInfo->fsid(), fsInfoExp.fsid()); - ASSERT_EQ(fsInfo->fsname(), fsInfoExp.fsname()); + ASSERT_EQ(CURVEFS_ERROR::NOTEXIST, ret); } TEST_F(TestFuseVolumeClient, FuseOpDestroy) { @@ -1718,23 +1701,12 @@ TEST_F(TestFuseS3Client, FuseOpInit_when_fs_not_exist) { EXPECT_CALL(*mdsClient_, GetFsInfo(fsName, _)) .WillOnce(Return(FSStatusCode::NOT_FOUND)); - EXPECT_CALL(*mdsClient_, CreateFsS3(_, _, _)) - .WillOnce(Return(FSStatusCode::OK)); - FsInfo fsInfoExp; fsInfoExp.set_fsid(100); fsInfoExp.set_fsname(fsName); - EXPECT_CALL(*mdsClient_, MountFs(fsName, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(fsInfoExp), Return(FSStatusCode::OK))); CURVEFS_ERROR ret = client_->FuseOpInit(&mOpts, nullptr); - ASSERT_EQ(CURVEFS_ERROR::OK, ret); - - auto fsInfo = client_->GetFsInfo(); - ASSERT_NE(fsInfo, nullptr); - - ASSERT_EQ(fsInfo->fsid(), fsInfoExp.fsid()); - ASSERT_EQ(fsInfo->fsname(), fsInfoExp.fsname()); + ASSERT_EQ(CURVEFS_ERROR::NOTEXIST, ret); } TEST_F(TestFuseS3Client, FuseOpDestroy) {